manually merged Mark's changes that I accidentally reverted...
Merge branch 'devel' of https://github.com/radical-cybertools/radical.pilot into devel