TBD-1136: Ref-Project:MR job & Storm Job are  editable
Merge remote-tracking branch 'origin/maintenance/5.6'