Merge "Bug 7349 - Flow ID not updated in operational after removing and adding a...