Merge changes from topic '3939'

* changes:
  Add support of Keystone OIDC Federation
  Rename  websso to federation