Properly mark attributes as deprecated
Merge pull request #6494 from ctomc/management-8x

[8.x] Properly mark attributes as deprecated