Enforce that store and layer names are xml-safe at the catalog level

Conflicts:
	src/main/src/main/java/applicationContext.xml