Merge "Add upgrade support for Horizon" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Wed, 1 Mar 2017 16:42:45 +0000 (16:42 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 1 Mar 2017 16:42:45 +0000 (16:42 +0000)

Trivial merge