Changed naming of saml_sso and scoped argument
Merge branch 'develop'

* develop:
  Changed naming of saml_sso and scoped argument