
Metadata fields we want to collect can now be defined in the config, and can be given more than one source option since the metadata field names change. This metadata now also is part of the json that is returned. Change-Id: Ibb901fd5f5d8e07019a56a9185508ea907e9543d