Merge "Revert "Fix of verify_glance_api_versions""