Fix conflicts between apache:master and w2ogroup:master

1. Branched w2ogroup:master to create w2ogroup:w2o-master-conflicts
1. Merged apache:master into w2ogroup:w2o-master-conflicts
1. Resolved merge conflicts
1. Opened this pull request for merging w2ogroup:w2o-master-conflicts into w2ogroup:master