Compatibility changes for EAP 6.x
Merge pull request #1357 from jbertram/2.3.x

Compatibility changes for EAP 6.x