Merge "Disable keystone boot auto start" into stable/colorado
authorshuai chen <chenshuai@huawei.com>
Thu, 8 Sep 2016 02:23:49 +0000 (02:23 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 8 Sep 2016 02:23:49 +0000 (02:23 +0000)

Trivial merge