NXP-10907 cleanup + minimal test on OpenID plugin
NXP-10907 Fix override and dependencies management