Add improvements from httpd24 formula to httpd22