Merge changes in revisions 4463-4499 from /trunk.
Also:

* CHANGES
  Add new CHANGE for brane's version.h mods.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/0.17.1@844574 13f79535-47bb-0310-9956-ffa450edef68
50 files changed