Merge "Update Keystone core to Mitaka."
authorRuan HE <ruan.he@orange.com>
Thu, 9 Jun 2016 08:12:34 +0000 (08:12 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 9 Jun 2016 08:12:34 +0000 (08:12 +0000)

Trivial merge