OOZIE-1670 Workflow kill command doesn't kill child job for map-reduce action (puru via rohini)
Merge remote-tracking branch 'remotes/origin/branch-4.0' into branch-4.0