Person merge code does not take into account inactive and proposed memberships

[Diogo Matsubara]

Steps to reproduce (using sample data):
1. Log in as Sample Person;
2. Open http://launchpad.dev/people/+requestmerge
3. Fill in 'Duplicated Account': spiv; Note that spiv is an proposed member in
ubuntu-team
4. Click Submit;
5. Open http://launchpad.dev/people/ubuntu-team/+members and you'll see
Andrew Bennetts (spiv-merged) as one of the proposed members.

A merged person shouldn't appear in that list.
Also note that if you access
http://launchpad.dev/people/ubuntu-team/+editproposedmembers spiv-merged
appears in that list and you can even approve his membership request.

[James Henstridge (jamesh)]

Note that due to the (person, team) unique key for team memberships, the merge code should handle the case where both people being merged have team membership records.

[Alan Bell (alanbell)]

this breaks python-launchpadlib code that itterates through team members doing stuff, it hits a person that does not exist and gets a 404 error and falls over.

[Robert Collins (lifeless)]

SPM reporting in the dupe, that (due to this bug), they have a pending invitation from a suspended user for the ~canonical-losas team.
Wanting to decline said invite.
click on the action butan, get an OOPS:
OOPS-6f070765c6fb24d1bb6435a0e4ef64b9

[Launchpad QA Bot (lpqabot)]

Fixed in stable r14904 <http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/14904>.