Merge "Check which glance client version to use"