Merge "Revert "VCN: Require capability matching on test networks for CTS""