Merge "Removing --flat and network_isolation variables"