Re-enabled csw tests
Bumped owslib and pycsw
safeguard non-null for language
Check a datastore for additional resources before deleting.  Fixes #1510.