MBS-5302: ISNI support for artists and labels
Revert changes to caa/CreateViews.sql

This change does not pertain to this branch.
Fix tests
Reimplement merge strategy to be O(1) rather than O(n)
Add ON_ERROR_STOP 1 to the upgrade script
MBS-5302: Improve comments
MBS-5302: Remove duplication between Edit::Role::IPI and Edit::Role::ISNI
MBS-5302: Add 'isni-code' class on artist/label pages around all ISNI codes
MBS-5302: Use the `comma_only_list` macro instead of `join()`
MBS-5302: Move ISNI constraints to a separate script so they aren't created on slaves
Merge branch 'mbs-5302-isni' into schema-changes-2013-05-15

* mbs-5302-isni:
  MBS-5302: Move ISNI constraints to a separate script so they aren't created on slaves
  MBS-5302: Use the `comma_only_list` macro instead of `join()`
  MBS-5302: Add 'isni-code' class on artist/label pages around all ISNI codes
  MBS-5302: Remove duplication between Edit::Role::IPI and Edit::Role::ISNI
  MBS-5302: Improve comments
  Add ON_ERROR_STOP 1 to the upgrade script
  Reimplement merge strategy to be O(1) rather than O(n)
  Fix tests
  Revert changes to caa/CreateViews.sql
  MBS-5302: ISNI support for artists and labels

Conflicts:
	lib/MusicBrainz/Server/Data/Artist.pm
	t/lib/t/MusicBrainz/Server/Edit/Artist/Edit.pm
Merge branch 'schema-changes-2013-05-15' of github.com:metabrainz/musicbrainz-server into schema-changes-2013-05-15

* 'schema-changes-2013-05-15' of github.com:metabrainz/musicbrainz-server:
  MBS-5272: automatically create initial bundled packet during upgrade
  MBS-5272: add documentation of --require-previous in BundleReplicationPackets
  MBS-5272: don't make it so the bundling script in the daily packet can inadvertently try to create unreasonably large bundles
  MBS-5272: add rollup replication to the daily script
Merge branch 'schema-changes-2013-05-15' of github.com:metabrainz/musicbrainz-server into schema-changes-2013-05-15

# By warp
# Via warp
* 'schema-changes-2013-05-15' of github.com:metabrainz/musicbrainz-server:
  MBS-4115, move foreign keys to the correct place in upgrade.sh
  MBS-4115, updates based on code review feedback.
  MBS-4115, Fix cover art archive replication triggers.
  MBS-4115, rename cover_art.image_type column to mime_type.  Update upgrade.sh.
  MBS-4115, use mime_type as primary key for image_type, simplify update script.
  MBS-4115, Schema changes for .png/.gif support.

Conflicts:
	upgrade.sh