[DO_NOT_MERGE] Config changes for httpd24 from scl