SLING-4095 : Clean up code and logging statements

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