Merge "Add tenant vlan support"