Keep more configuration in the config.yml
Merge branch 'feature/WmcBundle' of git://github.com/mapbender/mapbender-starter into feature/WmcBundle
mapbender update
fom update
mapbender update after merge
fom update