Apache 2.4 Backport

This is a rebase off of release/2.9 which includes the commits that implement the apache2.4 upgrade to develop.