Updates per metadata group discussion

bseeger requested to merge jan_updates into master

The diff around the dcterms:type is a little tricky as I edited it backwards (with the same results).

Merge request reports