GBE-438
GBE-438: Let dynamic configuration use a single datastore for all shapefile layers
GBE-438: Use dataSource in shapefile uploader too
GBE-438: Additional improvements for retrieving shapefile from datastore.
GBE-438: Additional improvements for retrieving shapefile from datastore.
GBE-438: Additional improvements for retrieving shapefile from datastore.
GBE-438: Additional improvements for retrieving shapefile from datastore.
Merge branch 'GBE-438'

Conflicts:
	plugin/deskmanager/deskmanager/src/main/java/org/geomajas/plugin/deskmanager/service/common/DynamicLayerLoadServiceImpl.java
	plugin/deskmanager/deskmanager/src/main/java/org/geomajas/plugin/deskmanager/service/manager/DiscoveryServiceImpl.java
	plugin/deskmanager/deskmanager/src/main/java/org/geomajas/plugin/deskmanager/service/manager/ShapeFileServiceImpl.java