Email config fixes
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into milestone6
Merge branch 'milestone6' of github.com:WSO2Mobile/mdm into milestone6