TDI-29687: fixed the refresh issue for MR/Storm Job.
Merge branch 'maintenance/5.6'