Merge "Run Glance initialization when Glance is enabled, not just registry"