Merge "Combine parameter_default fields"
authorJenkins <jenkins@review.openstack.org>
Mon, 11 Jul 2016 20:52:35 +0000 (20:52 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 11 Jul 2016 20:52:35 +0000 (20:52 +0000)

Trivial merge