Merge "During authorization, the subject ID was sometime the Keystone ID which leads...
authorRuan HE <ruan.he@orange.com>
Sun, 22 Nov 2015 21:42:39 +0000 (21:42 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sun, 22 Nov 2015 21:42:39 +0000 (21:42 +0000)

Trivial merge