Merge lp://qastaging/~sinzui/launchpad/delete-team-1 into lp://qastaging/launchpad

This is my branch to ensure team emails are deletes before the team is
deleted so that an oops is not raised.

    lp:~sinzui/launchpad/delete-team-1
    Diff size: 40
    Launchpad bug:
          https://bugs.launchpad.net/bugs/610850
    Test command: ./bin/test -vv -t peoplemerge-views
    Pre-implementation: no one.
    Target release: 10.09

ensure team emails are deletes before the team is deleted
----------------------------------------------------------

OOPS-1669EB4270 shows that the merge into ~registry failed.

The team did have an email address and I set the team to send to all
members
(implicitly deleting the email address). I then used the delete action
to
merge the team with ~registry

I expect the delete team rules to delete team email addresses as the
first
step of the merge. ie, calling team.setContactAddress(None).

Rules
-----

    * Add a rule to delete the team email addresses /before/ the team is
      deleted.

QA
--

    * On staging, locate a team that you are not a member of with an
email
      address. Choose to delete the team.
    * Verify the team is deleted
    * Look in the staging database and verify the team's email address
is
      not in the database.

Lint
----

Linting changed files:
  lib/lp/registry/browser/peoplemerge.py
  lib/lp/registry/browser/tests/peoplemerge-views.txt

Test
----

    * lib/lp/registry/browser/tests/peoplemerge-views.txt
      * Revised the delete team with email test to verify that email
addresses
        are deleted

Implementation
--------------

    * lib/lp/registry/browser/peoplemerge.py
      * Added a call to setContactAddress(None) to delete the team's
addresses
        before calling doMerge()