Merge "[N->O] is creating 2 default cell_v2 cells" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Fri, 31 Mar 2017 11:07:11 +0000 (11:07 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 31 Mar 2017 11:07:12 +0000 (11:07 +0000)

Trivial merge