Merge "[APEX][BGPVPN] Remove l2 from Name"