Feature #1348 - Provide a feature for users to merge with another account

This PR is long-running. It will be updated as code is written and may be merged and re-opened multiple times.

At the moment, it only contains the spec for discussion. Please make comments inline as per usual for PRs :)