Merge r1705983 from trunk:

Fix some style issues on files that can easily be synch'ed with 2.4.x
Submitted by: jailletc36
Reviewed/backported by: jim


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