linked to https://issues.jboss.org/browse/ERRAI-312
backported into wfk-prod-2.0.1.Final
Verified, tests passed in ER8a.