Fix bug 2157 to resolve issues with IETF L2VPN WIM connector