Fix merge issue for BgpXmppChannel constructor.