Update to Apache Server Configs v2.3.0
Merge remote-tracking branch 'base/master'