Merge "Bug 5267 - Setting vlan id for termination end point not working"