Properly mark attributes as deprecated
Merge pull request #6493 from ctomc/management

Properly mark attributes as deprecated