Merge pull request #1948 from lukecampbell/metadata

CIDEVSTC-290 Data Product Metadata and Catalog Management
Perhaps a fix for metadata issues