SLING-2987 - metatype and samples config tweaks

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