Merge branch '10808-admin-cancel-job'
authorTom Clegg <tom@curoverse.com>
Thu, 5 Jan 2017 17:42:22 +0000 (12:42 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 5 Jan 2017 17:42:22 +0000 (12:42 -0500)
refs #10808


Trivial merge