[PDI-9514] - Inconsistency in batch scripts
[PDI-12770] - Scripts reference non-existing classes
Merge pull request #723 from mbatchelor/master

[PDI-9514] / [PDI-12770] - Fix batch scripts