Merge "puppet: use identity_uri and auth_uri"