merge mod_version_for_2.0.x branch back to branches/2.0.x

* merge 160788 to 326121 from branches/mod_version_for_2.0.x, but leave out
  generated docs files (will cleanly rebuild later)

Reviewed by: Paul Querna, Bill Rowe, (Justin Erenkrantz), me


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@326129 13f79535-47bb-0310-9956-ffa450edef68