OAK-1697 : Unresolved conflicts in TokenProviderImpl#createToken()

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