MBS-7350: Load cover art types for Edit Cover Art

Cover art types were not loaded for the Edit Cover Art page. This
meant that the types for an image where not selected in the form by
default.
Remove merge conflict debris

Remove some commented-out lines of a merge conflict that were added in
commit aee9912b1f8200b6d55ebd974d77ac9ff4420019 a year ago.
Merge remote-tracking branch 'chirlu/mbs-7350' into beta

* chirlu/mbs-7350: (70 commits)
  Remove merge conflict debris
  MBS-7350: Load cover art types for Edit Cover Art
  Fix WS::2 tests for work attributes
  MBS-7335, MBS-7336: Prevent deprecated URLs from being added
  MBS-7334: IPI codes not correctly displayed
  ISWC code not shown on ISWC page
  MBS-7333: ISRC code not shown on ISRC page
  Add Wikimedia Commons and CPDL to the score whitelist (MBS-7330)
  MBS-7329: Importing a multiple artist freedb release gives a seeding error for the "artist" field
  Fix conditions for detaching to 404.
  MBS-7325: correct variable name when cancelling an AE election nomination.
  MBS-7323: URLs that can't be decoded as utf8 are blank
  Revert "MBS-6822: Revert "MBS-6067: Always work with an inc object""
  Use EditExternalLinks in entity controllers directly
  MBS-7322: Process both external link and ISWC edits
  Remove trailing whitespace
  Replace tabs with spaces
  Remove space between function and opening parentheses
  Don't strip the slash after the domain name for Facebook URLs (MBS-7319)
  Fix whitespace in URLCleanup.js
  ...
Fix tests: html prefix is not correct for xpath since rdfa removal, link types don't pass validation without descriptions.