Merge r595646, r595648 from trunk:

Finish up
  http://svn.apache.org/viewvc?view=rev&revision=102066
  http://svn.apache.org/viewvc?view=rev&revision=102205
from almost 4 years ago by removing abandoned logic from
the fixup hook.


no logic changes
just minor style fixes

Submitted by: trawick
Reviewed by: jim


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