Merge r1542765,1571214, resolving text conflicts and tweaked for 1.7 schema

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1542765@1571489 13f79535-47bb-0310-9956-ffa450edef68