Merge "Bug 1088 - flow id in operational not matched; after removal not removed compl...