DDF-61: fixed CatalogMetricsTest to not cause exceptions by
attempting to create metrics that already exist
Merge branch 'gdib-130'

Conflicts:
	catalog/core/catalog-core-metricsplugin/src/test/java/ddf/catalog/metrics/SourceMetricsImplTest.java