1.0.1: Merged revisions 1601388 and 1601757 (OAK-1804)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1601767 13f79535-47bb-0310-9956-ffa450edef68
1.0.1: Merged revision 1601768 (OAK-1804)

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