[EAP6-121] Add EAP6-121 upstream but disabled

https://issues.jboss.org/browse/EAP6-121