SLING-2810 - Mark Adamcin's tweaks, thanks\!

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