LPS-42869

Support for JBoss EAP 6.1 (committed as differences from 7.x)