merge revisions 1585963 and 1617463 (OAK-2015)

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