Bugfix: missing comma.
Adding additional CLI tests to jenkins.
Merge branch 'master' into wms_new_layer_factories_clean
Merge remote-tracking branch 'upstream/wms_new_layer_factories_clean'