merge into httpd.conf

minor updates