Fix for: https://issues.jboss.org/browse/SRAMP-436
Merge branch 'EricWittmann-SRAMP-436'