Sramp 396

https://issues.jboss.org/browse/SRAMP-396 
and
https://issues.jboss.org/browse/SRAMP-247