Changed code for defect fix ASM-1003; added exception for default vlan case in case of untagging