Sramp 515

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