1.0: Merged revisions 1593061 and 1593061 (OAK-1801)

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