Merge "Wait for IP add/remove in test_add_remove_fixed_ip"