Merge "Add missing glance multi-store configurations"