Bump onos and fabric-tna version to fix issues with INT

- Fixes to INT app GUI
- Fix for INT reports produced for non-ipv4 packets
- Fix for spgw direction field optimized out by compiler

Change-Id: I2a910414ca4692678df41db08f7757008ed65f5a
diff --git a/Makefile.vars b/Makefile.vars
index 761dfb8..1793c18 100644
--- a/Makefile.vars
+++ b/Makefile.vars
@@ -26,10 +26,10 @@
 # (2) Checkout Local source code (local branch not yet pushed);
 # (3) Fetch from Gerrit/Github (pending review in the form of refs/changes/... or pending pull request);
 
-export ONOS_VERSION            ?= 2.2.6-b2
+export ONOS_VERSION            ?= 930b0cdde44c268052cd4690652405fdc95ef924 # onos-2.2
 export TRELLIS_CONTROL_VERSION ?= 3.0.0
 export TRELLIS_T3_VERSION      ?= 3.0.0
 export FABRIC_TOFINO_VERSION   ?= e1cf4551b4ab74bb82a7cecf19d197698ffbc1cb
 export UP4_VERSION             ?= 74b8c5fad3315dd7d48f299abbd044b010638c13
 export KAFKA_ONOS_VERSION      ?= 2.4.0-SNAPSHOT
-export FABRIC_TNA_VERSION      ?= f8ddc6270e498bee28476386f32d3fea452eb357
+export FABRIC_TNA_VERSION      ?= ec40b45e229ff94821ed1f176ea4cce333f74cce