OAK-1949 : UserContext needs to be adjusted to reflect changes made with OAK-1922

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