Merge branch WIM: Connector using IETF L2VPN Service model