Merge branch 'mg/httpd-tests-update-for-apache-2.4'