MBS-799: remove primary-code elements erroneously expected by tests
Merge branch 'master' of github.com:metabrainz/musicbrainz-server