Additional fixes for:  https://issues.jboss.org/browse/SRAMP-384
Merge pull request #405 from EricWittmann/SRAMP-384

Additional fixes for SRAMP-384