Merge "On container removal FRM does not uninstall flows"