Use new keystoneclient middleware.

Change-Id: I04bba12dbe765b4ee16d026a37dbb26f737822f1
Merge "Use new keystoneclient middleware."