Sync with trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/nfc-nfd-aware-client@870334 13f79535-47bb-0310-9956-ffa450edef68