Merge "Revert "Revert "remove external_network_bridge option"""