Merge "Fixup the start of swift services"
authorJenkins <jenkins@review.openstack.org>
Fri, 4 Nov 2016 14:08:08 +0000 (14:08 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 4 Nov 2016 14:08:08 +0000 (14:08 +0000)

Trivial merge