Merge "Add test_reuse_ip_address_with_other_fip..."