Sync wc-collate-path branch with trunk up to r1479898.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/wc-collate-path@1479901 13f79535-47bb-0310-9956-ffa450edef68