Merge "Fix enabling zaqar keystone endpoint and MySQL database" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Fri, 1 Sep 2017 18:36:55 +0000 (18:36 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 1 Sep 2017 18:36:55 +0000 (18:36 +0000)

Trivial merge