[PDI-9514] - Inconsistency in batch scripts
[PDI-12770] - Scripts reference non-existing classes