Merge "Glance client images URL fixes"