PDI-8195 - incorrect Step metrics At Synchronize after merge

Added validation for non-batch mode
Resubmitting after rebase