DDF-436 - made minor fixes to support CSW Federation between CswSource and CswEndpoint