Merge branch 'release/3.0.3.0' into develop
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
Release version 3.0.3.1
Merge branch 'release/3.0.3.1'