HFX-1174: CA-130821 - better handling of Task.destroy API

Per HFX-1174, pick up CA-130821 fix to clearwater-sp1-lcm.