EAP6-71 remove dependencies to private JBoss APIs