Fix as per nereid changes #4765

Email field has been removed from address, email should be picked from
contact_mechanisms
Merge pull request #36 from tarunbhardwaj/develop

Fix as per nereid changes