SLING-3615 : applying SLING-3615-2.patch from Robert Munteanu, thx for the refactoring!

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