Minor fixes to wls-managed-12.1.3 for use with WLS and CDI tck.