Merge "Split docker options and insecure registry"
authorJenkins <jenkins@review.openstack.org>
Wed, 28 Jun 2017 13:50:48 +0000 (13:50 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 28 Jun 2017 13:50:48 +0000 (13:50 +0000)

Trivial merge