On the fsfs-ucsnorm branch: Synced with trunk up to r1575684.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/fsfs-ucsnorm@1575685 13f79535-47bb-0310-9956-ffa450edef68