Email field is made not mandatory in user creation and editing.

Change-Id: I92a3b5539a20d855ae725a2993bf77eace3c0e28
Fixes: bug #1185195
Merge "Email field is made not mandatory in user creation and editing."