merge r1601676, r1602183, r1602227

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