NXP-10907 cleanup + minimal test on OpenID plugin