aligned configurations with the current ones
Merge branch 'C001' of https://github.com/geosolutions-it/mapstore into C001