config change - autowiring, moving properties
config change - change Apache property name
Merge remote-tracking branch 'origin/master'