JBIDE-15614 - Add support for EAP 6.2 (plus minor changes to original
patch)