Merge "Log at ERROR level when add/remove flow fail"