Added more unit tests for TRQ-899: adding output and err paths in the cancellation email.
Merge branch 'master' of https://github.com/adaptivecomputing/torque