Minor code clean up and move property descriptions/labels into separate metatype.properties

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1470624 13f79535-47bb-0310-9956-ffa450edef68