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

Fix the way descriptions are resolved. Some attributes should not use th...