Fix for: https://issues.jboss.org/browse/SRAMP-233
Fix for issue: https://issues.jboss.org/browse/SRAMP-230
Fix for issue: https://issues.jboss.org/browse/SRAMP-230  (PATCH
REQUIRED)
Fix for issue: https://issues.jboss.org/browse/SRAMP-232 (PATCH
REQUIRED)
Merge pull request #314 from EricWittmann/multiple-bug-fixes

Multiple bug fixes - see comment