BS-2880,move 6.0.2 to 6.0.4
BS-2882, add 6.0.3 to 6.0.4
BS-2882, add 6.0.2 to 6.0.3
Merge branch 'steps-6.0.2-6.1.0'