Fix for: https://issues.jboss.org/browse/SRAMP-393
Merge pull request #439 from EricWittmann/SRAMP-393

Fix for: https://issues.jboss.org/browse/SRAMP-393
Fix for:  https://issues.jboss.org/browse/SRAMP-446
Merge pull request #440 from EricWittmann/SRAMP-393

Fix for:  https://issues.jboss.org/browse/SRAMP-446