Merge "Fix satellite registration for http or https"
authorJenkins <jenkins@review.openstack.org>
Thu, 24 Mar 2016 18:06:00 +0000 (18:06 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 24 Mar 2016 18:06:00 +0000 (18:06 +0000)

Trivial merge