Exclude users with blank email.
Remove the user constraint on table auth_message.

The auth_message table is removed in django 1.4, but the table is still hanging around on some sites, which causing the constraint issue for user merge.