https://issues.jboss.org/browse/RAILO-3058
Merge branch '4.2_jira3058_cfchartStepCutOff' into 4.2