Merge "Fixup network configuration for ext-net"