JAL-3746 fix bad merge from 2.11.1.4/5 branch cherrypick