SLING-3046 - fix conflicting export/private statements, cause trouble with maven-bundle-plugin 2.4.0

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