Merge "Minor fixes to allow local docker registry usage"
authorJenkins <jenkins@review.openstack.org>
Mon, 15 Feb 2016 19:24:01 +0000 (19:24 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 15 Feb 2016 19:24:01 +0000 (19:24 +0000)

Trivial merge