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
Merge branch 'mbs-5302-isni' into schema-changes-2013-05-15

* mbs-5302-isni:
  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