Fix for https://issues.jboss.org/browse/RTGOV-545
Merge branch 'EricWittmann-RTGOV-545'