Enforce that store and layer names are xml-safe at the catalog level
Merge remote-tracking branch 'upstream/master'