Merge "Align optional services with optional services-docker"
authorJenkins <jenkins@review.openstack.org>
Fri, 26 May 2017 08:49:02 +0000 (08:49 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 26 May 2017 08:49:02 +0000 (08:49 +0000)

Trivial merge