JBTM-1889 Update to fix compensationScopedTest
Merge branch 'JBTM-1889' of git://github.com/zhfeng/narayana into zhfeng-JBTM-1889