Remove spurious stuff from mapviewer.wmc
Fix Invalid Keyword in Thesaurus bug: caused by splitting keywords using
comma char - doesn't work when the Keyword actually contains a comma!
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x

Conflicts:
	web/src/main/webapp/maps/mapviewer.wmc