Merge in Keystone auth changes