Merge "Flat/VLAN network type support"