Merge glance-image-sync fixes from master to v4.2.2rc