Merge pull request #358 from geoserver/cswtest

CSW: backport all recent patches
CSW: Fix syntax error in mapping file.