Merge "ha/glance-fs: avoid a race condition"