Make inetvpn_peer_test more robust

Use StateMachineTest instead of StateMachine to make sure that
BgpPeers get established before the test times out.

A few other cosmetic changes.

Change-Id: I62740cfeaa196cace445d58010ae736f39af27fc
Merge "Make inetvpn_peer_test more robust"