[GEOS-5369] CSW GetRecordById will NPE in case there are multiple record types available
Merge branch 'master' of git://github.com/geoserver/geoserver