* Update security to honor the 'Is Confirmed' and 'Is Locked' settings on a user's login record.
* Updated the person merge to warn when merging two people with different email addresses and existing logins since this could be an attempt to hijack a persons record.