Changes to sync with wildfly/eap PL 2.5 inclusion.

Some small fixes to include it wildfly and eap.