Merge branch 'openid-enhancements' into 'devel'

OpenID enhancements

See merge request !165
Status Job ID Name Coverage
  Test
passed #4807
pycco

00:06:35

passed #4806
test_and_coverage

00:07:41

71.0%