Sramp 408

https://issues.jboss.org/browse/SRAMP-408
https://issues.jboss.org/browse/SRAMP-410