SLING-2986 : Merged Resource Provider. Minor code changes and metatype info

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