Merge branch 'bridge_vlan_cleanups_fixes'