Further tracking down 2.4 changes.
Merge pull request #320 from goehle/apache24v2

More Apache 2.4