Merge branch '11769-scancel-jobs-only' closes #11769
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 30 May 2017 15:18:41 +0000 (11:18 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 30 May 2017 15:18:41 +0000 (11:18 -0400)

Trivial merge