https://issues.jboss.org/browse/JBTM-1511

Added configuration option to enable/disable the optimsation. QA
disables it so existing tests can run.