MBS-1941, display both catalog number and label in release label edits, even if only one of them changes.
Merge branch 'master' into mbs-1941

* master: (255 commits)
  Add libdb-dev to the prerequisites (required by DB_File 1.72, which is required by Cache 2.04).
  Slightly change User::Register tests to just extract the nonce
  Add HTML::Selector::XPath to the test dependencies
  Add Test::XPath to dependencies for full test run
  Install IO::All for compile_resources script
  Manually work around the bad naming of libintl-perl
  Fix edit recording controller test now that join phrases are non null
  Only try and clean edit recording artist credits if the artist credit has changed
  Initialize barcodes correctly from search results.
  Do not rely on DBDefs::WEB_SERVER_USED_IN_EMAIL being set to any particular value in tests.
  Use [none] for no barcode for consistency
  MBS-2799, Added Edit::Utils->merge_barcode to make sure release edits with barcode changes are accepted correctly.
  MBS-3692/MBS-3798: Fix Amazon cover art for .es and .cn
  MBS-4211: Do not try and copy track changes to new recordings
  MBS-4199: Remember and display the state of 'search relationship type' searches
  Improvements to INSTALL
  Add Cache::FastMmap and Catalyst::Plugin::Session::Store::FastMmap dev modules
  Bundle Catalyst::Restarter
  Manually work around the bad naming of libintl-perl
  Use release->barcode->format in barcode tests.
  ...
MBS-1941, show more information in release label edits (date, country, barcode, format).
MBS-2242, clear the disc title of disc 1 on leaving the tracklist page (if there is only one disc).
MBS-2242, clear the disc title of disc 1 on leaving the tracklist page (if there is only one disc).
MBS-3208, Add some more trim()s to the release editor.
Merge branch 'master' into mbs-3208

* master: (36 commits)
  Use DBDefs::DB_STAGING_TESTING_FEATURES instead of DBDefs::DB_STAGING_SERVER in Controller::Test to disable/enable testing features.
  fix crash in TrackParser.js which occurs on new discs, update mbs-2151-medium-required selenium test to match current error message.
  MBS-1929, Clarify comment explaining why a medium must be added when there isn't one (in prepare_tracklist).
  Upgrade Catalyst::Plugin::Unicode::Encoding to 1.3
  Remove debugging code from WebService/Validator.pm
  Fix CoverArt tests with recent barcode changes
  Memcached must be installed to run carton install --deployment
  some more fixes
  a few more I'd missed
  template::plugin::javascript to carton.lock, hopefully
  master carton.lock
  use Template::Plugin::JavaScript to properly escape JS strings
  statistics: Add explanation about missing "0" releases
  MBS-1925, add $for_change_hash to most calls to artist_credit_to_ref in MusicBrainz::Server::Edit classes -- they don't need the extra fields.
  MBS-1935, add missing sortname / disambig comment in javascript rendering of artists.
  ReleaseGroup edits now always include the joinphrase key, even if the joinphrase is empty.
  Stats for artists with/without appearances in artist credits
  add format statistics, plus interface
  Add content from http://wiki.musicbrainz.org/User:kuno/Testing to HACKING.
  Upate our documentation on testing.
  ...
MBS-3208, strip double spaces in release editor, including label and catalogue fields.
MBS-2867: After adding n tracks, reset the input field to 'add 1 track'
Merge branch 'master' into mbs-3208

* master: (61 commits)
  Load Static::Simple when running tests, to make sure /static files are served correctly when running Selenium tests.
  MBS-4287: Fix 'artist country' edit search
  MBS-4285: /ws: Only skip rendering the body of tags if it's an empty or undefined string
  Upgrade to latest Moose and HTML::FormHandler
  Remove Memory::Cycle tests
  Fix a warning if a release has a null annotation in the release editor
  Fix INSTALL to correctly mention plackup
  Fix a warning view 'create work' edits which have no work type
  Fix a possible warning in the release editor
  Fix Plack debug stuff with the search DAO
  Do not run asynchronous tagging code if there is no user logged in
  Remove remaining tabs from nginx file.
  MBS-4210, provide an easy way to switch between production and staging robots.txt files.
  Remove most of the comments about a "system level" setup, most of this is solved by using Carton.
  Update Catalyst::Runtime version in the Makefile
  MBS-3590, make sure the session store and the wizard are using Cache::Memcached::Fast.
  MBS-1935, do not include the "preview" key in MB.Control.ArtistCredit.toData () output.
  MBS-4204: Add production stacktraces/error pages to master branch
  MBS-3677: Display disambiguation comments for releases in /recording page
  MBS-4236: Run edit search tests
  ...

Conflicts:
	root/static/scripts/edit/MB/Control/ArtistCredit.js
MBS-3208, Move Form::Field::Text trimming to Data::Utils.
Merge branch 'master' into mbs-1941

* master: (98 commits)
  Load Static::Simple when running tests, to make sure /static files are served correctly when running Selenium tests.
  MBS-4287: Fix 'artist country' edit search
  MBS-4285: /ws: Only skip rendering the body of tags if it's an empty or undefined string
  Upgrade to latest Moose and HTML::FormHandler
  Remove Memory::Cycle tests
  Fix a warning if a release has a null annotation in the release editor
  Fix INSTALL to correctly mention plackup
  Fix a warning view 'create work' edits which have no work type
  Fix a possible warning in the release editor
  Fix Plack debug stuff with the search DAO
  Do not run asynchronous tagging code if there is no user logged in
  Remove remaining tabs from nginx file.
  MBS-4210, provide an easy way to switch between production and staging robots.txt files.
  Remove most of the comments about a "system level" setup, most of this is solved by using Carton.
  Update Catalyst::Runtime version in the Makefile
  MBS-3590, make sure the session store and the wizard are using Cache::Memcached::Fast.
  MBS-1935, do not include the "preview" key in MB.Control.ArtistCredit.toData () output.
  MBS-4204: Add production stacktraces/error pages to master branch
  MBS-3677: Display disambiguation comments for releases in /recording page
  MBS-4236: Run edit search tests
  ...
MBS-1941, save date/country/barcode/combined_format from a release in edit release label edits.
MBS-3398: Allow "M-" and "M." to prefix track numbers in tracklists
MBS-4314, add up/down buttons on tracks to reorder them.
MBS-834: Replace search method checkboxes with mutually exclusive radio buttons

There are 3 possible states to do a search in: an indexed search, an advanced
indexed search and a direct database search. This is better modelled as radio
buttons, as a pair of checkboxes actually represents 4 states.
MBS-2412: Sort a users tagged entities, when viewing a tag
MBS-4314, disable track position editing on tracklist tab of relaese editor.
MBS-4314, disable track re-order buttons for discs with a TOC
MBS-3482: Automatically clean up YouTube channel relationships