Fixes for:  https://issues.jboss.org/browse/SRAMP-451

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