This looks like you're mixing backwards-compatible changes in the get and submit methods with non-backwards-compatible ones in the includes. If I understood https://bitbucket.org/metabrainz/musicbrainz-server/pull-request/445/mbs-6693-puid-support-in-ws-1-2-should-act/diff correctly, the server will still deal with requests for PUIDs, so imho we should just rely on the server doing the right thing and keep those includes.