On the file externals branch.

* branches/file-externals:
  Merge r33206 through r33227 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/file-externals@873302 13f79535-47bb-0310-9956-ffa450edef68