Replace usage of 'apache' with 'apache httpd' where appropriate

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436394 13f79535-47bb-0310-9956-ffa450edef68