Allow the ldap logins with email or username

Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
Update the proc/lamda to be consistent

Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3