SLING-2853 Commit patch 4 by Amit Gupta (Thanks alot)

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