Update stable to SD-Fabric v1.0 RC1

TODO
- Publish ONOS artifacts for 2.5.5-rc1 - DONE
- Merge PR and tag trellis-control for 3.1.0-rc1 - DONE
    Jenkins refuses to tag non SemVer versions
    https://gerrit.onosproject.org/c/trellis-control/+/25055
- Merge PR and tag trellis-t3 for 4.0.0-rc1 - Done
    Jenkins refuses to tag non SemVer versions
    https://gerrit.onosproject.org/c/trellis-t3/+/25058
- Merge PR and tag fabric-tna for 1.0.0-rc1 - DONE
    https://github.com/stratum/fabric-tna/pull/403
- Merge PR and tag up4 for 1.0.0-rc1 - DONE
    https://github.com/omec-project/up4/pull/186

Also, provide means to skip trellis-t3, which is currently not used in
SD-Fabric.

Change-Id: I4a7ecd2df4f42b59e475382461fcd22d56649bf7
diff --git a/Makefile.vars.master b/Makefile.vars.master
index 8a11652..29ffc95 100644
--- a/Makefile.vars.master
+++ b/Makefile.vars.master
@@ -27,7 +27,7 @@
 # (3) Fetch from Gerrit/Github (pending review in the form of refs/changes/... or pending pull request);
 
 export ONOS_VERSION            ?= onos-2.5
-export TRELLIS_CONTROL_VERSION ?= 3.0.1-SNAPSHOT
+export TRELLIS_CONTROL_VERSION ?= 3.1.0-SNAPSHOT
 export TRELLIS_T3_VERSION      ?= 4.0.0-SNAPSHOT
 export UP4_VERSION             ?= master
 export FABRIC_TNA_VERSION      ?= main