Fixing #5939 lead to a build failure as OAuth2 related configuration was
defined twice. This is also related to #5973.