Merge r1639507,1639519,1639634,r1665611,r1665612 and fix trivial conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-httpd-version-tests@1670812 13f79535-47bb-0310-9956-ffa450edef68
5 files changed