Merge "Make upgrade steps unconditional to fix broken dependencies"
authorJenkins <jenkins@review.openstack.org>
Thu, 11 May 2017 10:50:02 +0000 (10:50 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 11 May 2017 10:50:02 +0000 (10:50 +0000)

Trivial merge