1.0.1: Merged revision 1593554 (OAK-1810)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1595852 13f79535-47bb-0310-9956-ffa450edef68
Oops, revert incorrectly merge from revision 1595852

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

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