Merge "N->O Upgrade, make sure all nova placement parameter properly set." into stabl...
authorJenkins <jenkins@review.openstack.org>
Thu, 30 Mar 2017 11:50:53 +0000 (11:50 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 30 Mar 2017 11:50:53 +0000 (11:50 +0000)

Trivial merge