Includes the work needed for https://issues.jboss.org/browse/EAP6-22
https://github.com/jbossas/jboss-eap/pull/975
John Doyle <jdoyle> updated the status of jira EAP6-22 to Closed