Catch and handle email change exceptions
Add tests of exception handling behavior
Merge pull request #5373 from edx/renzo/handle-email-change-exceptions

Catch and handle email change exceptions