Fix subvlan reconfiguration
Add inner VLAN count
QinQ alternate fix