Fix csw client to properly use getrecords2
Merge branch 'tomkralidis-master'
Revert accidental deletion from ffc5121c