OAK-1570 merged last trunk

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