Ability to discontinue job roles

[#1]

Our organization went through a reorg. As a result, six roles are being merged into 1 new role. We want to -

1.. Discontinue the old roles so that they no longer show up on the new resource estimates. They should show up on the existing projects where resource estimates contain these roles. However, when a user is creating a new resource estimate, he should not see these roles.

OR

1. Transfer the separate resource estimates on the old roles to a combined new role replacing them and then delete the old roles.

Currently neither is possible in Workfront.

[#2]

Would like to see this for both JobRoles and HomeGroups.

For example, If we want to obsolete a job role, then existing records should retain all the history of old job roles, but when people assign tasks, they should only assign to the active job roles.