Merge "Fix container flow logic in forwarding rules manager"