Fix the way descriptions are resolved. Some attributes should not use the common description.
Merge pull request #6402 from jamezp/desc-fix-8.x

[8.x] Fix the way descriptions are resolved.