Merge "Update properties being set for octavia rabbit properties"
authorJenkins <jenkins@review.openstack.org>
Tue, 14 Mar 2017 15:18:03 +0000 (15:18 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 14 Mar 2017 15:18:03 +0000 (15:18 +0000)

Trivial merge