Merge "Add service config settings to agent services"
authorJenkins <jenkins@review.openstack.org>
Fri, 21 Apr 2017 19:52:52 +0000 (19:52 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 21 Apr 2017 19:52:52 +0000 (19:52 +0000)

Trivial merge