Merge "Clean up old functions"
authorJenkins <jenkins@review.openstack.org>
Thu, 25 Aug 2016 10:41:34 +0000 (10:41 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 25 Aug 2016 10:41:34 +0000 (10:41 +0000)

Trivial merge