Merge "Fix inconsistent Manila service naming"
authorJenkins <jenkins@review.openstack.org>
Fri, 11 Nov 2016 14:47:28 +0000 (14:47 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 11 Nov 2016 14:47:28 +0000 (14:47 +0000)

Trivial merge