Merge "Fix FloatingIpTestCasesAdmin.test_two_vms_fips"