Merge r1326227 from trunk:

Replace instances of "Apache" with the full software name or a simple reference to "the server".

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