[advanced-reboot] Fix testing hang when doing BGP shutdown on Arista VM#1579

lguohan merged 2 commits intosonic-net:mastersonic-net/sonic-mgmt:masterfrom

vincentchiang-ec:mastervincentchiang-ec/sonic-mgmt:masterCopy head branch name to clipboard