1096822 - Don't set a canceled Task to finished.

https://bugzilla.redhat.com/show_bug.cgi?id=1096822
Merge branch 'rbarlow-1096822'