Merge up some more Apache 2.2 changes.