Merge "[qca-nss-sfe] adding support of VLAN for GRE"