SLING-3460 - internal refactoring to ease meta-annotation support

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