PM-759: Optmization of the script
Merge branch 'master' of https://github.com/pegasus-isi/pegasus