Merge "Fixes race condition in test_add_remove_fixed_ip"