fixed merge conflicts
fixed merge conflicts
fixed merge conflicts
Merge pull request #400 from lat-lon/jrcportal-1723-resourceHandling-ISOMetadataStore

resource handling iso metadata store