Merge branch 'cb/httpd-test-fix-port'