Merge "Reinstantiate parts of code that were accidentally removed"
authorJenkins <jenkins@review.openstack.org>
Tue, 27 Sep 2016 01:11:32 +0000 (01:11 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 27 Sep 2016 01:11:32 +0000 (01:11 +0000)

Trivial merge