Merge branch 'tc/test-locate-httpd'