Changes for OpenId based SSO
Merge branch 'origin/master'