Fixes for:  https://issues.jboss.org/browse/SRAMP-451
Merge pull request #441 from EricWittmann/SRAMP-451-fixes

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