1.0: Merged revision 1588033 (OAK-1076)

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

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