Merge "Revert "Revert "Add enforce_scope setting support for keystone"""