JCR-3687 : Backport improvements made to token based auth in OAK

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.6@1574098 13f79535-47bb-0310-9956-ffa450edef68