Revert "Revert "Merge branch 'mbs-209' into beta""

This reverts commit b14d810ecfef9ff5648edbfbc91e8093fc0d97ae.

Conflicts:

	lib/MusicBrainz/Server/WebService/WebServiceInc.pm
Merge branch 'master,with-mbs-209-revert-reverted' into mbs-209

* master,with-mbs-209-revert-reverted: (443 commits)
  Revert "Revert "Merge branch 'mbs-209' into beta""
  Remove constraints that haven't been applied to master
  Do not copy mbdump-private.tar.bz2.gpg to FTP
  Revert "Use upgraded jquery in tests/all.html, include underscore and underscore.string in tests/all.html."
  Revert "MBS-5326: Fix ArtistEdit now that begin/end date fields have changed names"
  Revert the relationship editor
  MBS-5369: Add a test to ensure removing a label name works correctly
  MBS-5369: make sure that EditReleaseLabel edits to remove labels still work
  MBS-5326: Fix ArtistEdit now that begin/end date fields have changed names
  Revert "Merge branch 'mbs-209' into beta"
  i18n: update estonian translation
  Update translations from transifex.
  Fix a couple of typos
  Add classes on other entity pages
  Include edit type as a class when displaying edits
  Add classes to various headings and sidebar entries on the release page
  MBS-5325: deduplicate
  fix statistics .po/.pot files
  Update translations to current status of translations branch.
  MBS-5325: jquery update meant that the return value of .attr('name') changed to undefined and thus broke when we weren't checking for its definedness
  ...
MBS-209, render annotation according to current xml schema and add annotations to json.

Render annotation in a <text> element inside the <annotation>, to
match the existing annotation element in the XML schema.  Also add the
annotation filed to the json webservice.
Merge branch 'master' into mbs-209

* master: (234 commits)
  Update translations from transifex.
  Update root/static/scripts/common/MB/Control/SelectAll.js
  Revert "Merge branch 'i18n-nop-context' into beta"
  MBS-5473: create controlled_for_whitespace and helper functions in upgrade.sh
  MBS-5463, fix typo in previous commit.
  MBS-5463, set name/barcode/comment fields in the correct hash in ReleaseEditor::Add (fixes crash introduced in previous commit).
  MBS-5463, don't allow null / undef as release disambig comment, always initalize to a string.
  schema change: Run SetSequences in order to get correct sequence values before slaves migrate; otherwise duplicate credit merging will fail
  schema change hotfix: use Form::Field::Comment in the RE, not Text, as this field cannot be null
  Revert "Don't create {artist,label}_idx_uniq_name_comment, since they break with the dump we've been using for testing."
  Explicitly drop broken indexes in upgrade.sh as well.
  Don't create {artist,label}_idx_uniq_name_comment, since they break with the dump we've been using for testing.
  Fix pgtap tests
  Fix upgrade process to work on slaves that don't have the caa schema.
  CAA replication: Import dumped CAA schema before migration, not after, as this is where master dumped it.
  CAA/statistics replication: drop statistics triggers appropriately, and recreate them correctly at the end of upgrade.sh
  MBS-3791: Remove controlled_for_whitespace(description) again, falsely re-added
  feh, remove a comma
  Remove 'created' column from release_group_secondary_type, where it shouldn't be.
  Various schema change process improvements:
  ...

Conflicts:
	lib/MusicBrainz/Server/WebService/WebServiceInc.pm
Merge branch 'mbs-209' into beta

* mbs-209:
  MBS-209, render annotation according to current xml schema and add annotations to json.
  Revert "Revert "Merge branch 'mbs-209' into beta""