MBS-4115, Don't default to image/jpeg.
Merge branch 'mbs-4115-no-default' into mbs-4115

* mbs-4115-no-default:
  MBS-4115, Don't default to image/jpeg.
MBS-4115, include "image/jpeg" in t/sql/caa.sql.
MBS-4115, add \set ON_ERROR_STOP 1 to admin/sql/caa/*.sql
MBS-4115, default to 'image/jpeg' in Data::CoverArtArchive and make sure that type is available in AddCoverArt tests.
MBS-4115, Move adding 'image/jpeg' row from individual tests to t/sql/release.sql.
Merge branch 'master' into mbs-4115

* master: (293 commits)
  Display further documentation for relationship types
  Add multiple release events to JSON
  Add mising files
  Add <release-event-list> to /ws/2 <release>
  MBS-2229: User facing changes for multiple release events
  MBS-1839, drop constraint IF EXISTS in 20130318-track-mbid-reduplicate-tracklists.sql
  MBS-799/MBS-5919/MBS-5920: add edit_area table
  Removing AC docs from work edit form
  Fix the search_path for documentation FKs and PKs
  MBS-799/MBS-5919: add area_gid_redirect to import/export scripts
  MBS-799/MBS-5919: add missing area_gid_redirect table
  Match column ordering in upgrade.sh with CreateTables.sql
  Make join phrase diff check full words
  Adding license logos to the sidebar
  Show lyrics language on ISWC pages
  Removing ratings from work merge page
  MBS-5979: stupidly used == rather than eq
  MBS-5933: Do not create the release.date_year/month/day indexes
  Fix ExportAllTables --without-replication to work on standalone instances
  document MUSICBRAINZ_USE_PROXY
  ...

Conflicts:
	admin/sql/caa/CreateTables.sql
	t/sql/release.sql
Merge branch 'mbs-4115'

* mbs-4115:
  MBS-4115, Move adding 'image/jpeg' row from individual tests to t/sql/release.sql.
  MBS-4115, default to 'image/jpeg' in Data::CoverArtArchive and make sure that type is available in AddCoverArt tests.
  MBS-4115, add \set ON_ERROR_STOP 1 to admin/sql/caa/*.sql
  MBS-4115, include "image/jpeg" in t/sql/caa.sql.
  MBS-4115, Don't default to image/jpeg.