Merge "Add enforce_scope setting support for Glance"