Merge "Update code from KeystoneMiddleware Github repository (Master)."
authorRuan HE <ruan.he@orange.com>
Thu, 24 Sep 2015 12:58:47 +0000 (12:58 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 24 Sep 2015 12:58:47 +0000 (12:58 +0000)

Trivial merge