Upgrade from Apache 2.2 to 2.4 conventions