GBE-438 Let dynamic configuration use a single datastore for all shapefile layers

Some additional improvements can be merged