SLING-3553 - varius minor fixes (final modifiers, visibility issues, etc.)

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