Compatibility changes for EAP 6.x
Merge pull request #1358 from jbertram/master

Compatibility changes for EAP 6.x