Merge r1600311,1600315,1600323,1600393 from trunk, resolving a trivial text conflict

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