Merge "Add fixed ip cleanup to test_add_fixed_ip"