Updated to latest contrib version
"return self.cancel(context)" -> "self.cancel(context)\n return {'CANCELLED'}"