Grizzly changes for keystone

includes
  upgrades
  token_format default to UUID