Merge "[qca-nss-ecm] Allow disable of VLAN support"