Merge branch 'sg/httpd-test-unflake'