refactor this test to allow for timeouts
[bamboo] Automated branch merge (from 1.10:20ecfe3bc7e72ef43526ebb054133ff933ece35f)
Avoid unnecessary noise on PhysInterfaceTableTracker when the ifPhysAddress is null
[bamboo] Automated branch merge (from 1.12:bee4b78ee3bffd3480ae9ed3d94aa7d8446a6f91)