Merge "VCN: Allow restricting TRANSPORT_TEST for CTS"