AW: Upgrade to Apache 2.4