idp 4.0 with oidc 2.0, no OIDCExtendedNamingRegistry

[Jim Fox]

I merged the OIDC 2.0 plugin into idp 4.0.  On startup I get a 'failed to load' error on the AttributeRegistryService.

   Service 'shibboleth.AttributeRegistryService': Initial load failed
   Caused by: ..NoSuchBeanDefinitionException: No bean named 'OIDCExtendedNamingRegistry' available
   Service 'shibboleth.AttributeRegistryService': No further attempts will be made to reload

And searching through everything in (idp_home) I can find no bean definition for OIDCExtendedNamingRegistry.
Nor anywhere in the oidc 2.0 tar file.

Jim