Merge "Bug 4816 - Change common attributes' descriptions into resource neutral"