liked to https://issues.jboss.org/browse/ERRAI-313
backporteds into wfk-prod-2.0.1.Final
Verified in ER8, tests passed.