Merge branch 'fix-2-dsa-issues-with-vlan_filtering_is_global'