SLING-2944 Revert Service User Mapper changes to cut a 2.1.2 release before applying these changes again

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