Again with the Apache 2.4

This is the backport to release/2.9. .... 

To the right branch this time.  Yeesh.