Add graphicOverview back into list as needs to be present in order to
remove it if required
descriptiveKeywords needs to be displayed even if not present in flat mode
Exclude some unused mcp: elements unless they are present
Merge remote-tracking branch 'upstream/master'