Sramp 511

https://issues.jboss.org/browse/SRAMP-511