SLING-3027 update and improve features

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