Use br-tun when discovering the VLAN tag for a GRE tunnel

Change-Id: I779ee6a1a034e2ddf5daac8785f895dd54a7e550
Closes-Bug: #1323679
Merge "Use br-tun when discovering the VLAN tag for a GRE tunnel"