Merge "End of Keystone code update to branch Master and fix some bugs."
authorRuan HE <ruan.he@orange.com>
Mon, 7 Sep 2015 12:34:45 +0000 (12:34 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 7 Sep 2015 12:34:45 +0000 (12:34 +0000)

Trivial merge