Merge pull request #2657 from c-po/backports
smoketest: bgp: T4163: use explicit kill to respawn bgpd process