Merge "[bgpvpn] Remove _create_port & create_keypair"