Keystone user can't perform revoke_token

To Fix keystone Bug: #1186059
and
Bug: #1221889

Change-Id: Iefc2d87863f386ed3fe3263e4e4feb192420b5b5
Merge "Keystone user can't perform revoke_token"