Compatibility changes for EAP 6.x