JC-1404 fixed change mail validation
Merge remote-tracking branch 'origin/master'