[PDI-12211] - Fix BaseStepTest compile errors in 5.1
Merge pull request #708 from akhayrutdinov/SP-1388

[SP-1388] - Fix BaseStepTest compile errors in 5.1