Merge "Bug 5208 - flows don't get removed on update"