Merge r472949 from trunk:

Minor niggles that have been sitting around for a while



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