Minor fixes to wls-managed-12.1.2 for use with wls and cdi tck.