Merge "Reduce number of steps for upgrades"
authorJenkins <jenkins@review.openstack.org>
Fri, 3 Feb 2017 21:42:33 +0000 (21:42 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 3 Feb 2017 21:42:33 +0000 (21:42 +0000)

Trivial merge