Merge r1567996 and r1568009 from /trunk and resolve text conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1567996@1568022 13f79535-47bb-0310-9956-ffa450edef68