Merge branch 'jk/do-not-run-httpd-tests-as-root'