Initial merge with dev code.
Changes for supporting identifier_select mode of openid.
Changes for supporting identifier_select mode of openid.