OAK-1959 merged rev 1609081



git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1609083 13f79535-47bb-0310-9956-ffa450edef68
OAK-1890: Merged revision 1609064

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