1.0: Merged revisions 1591704, 1591713, 1591715 and 1591723 (OAK-1789)

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