Merge "Fixes additional legacy problems found when reviewing patch 58483"
authorSteven Pisarski <s.pisarski@cablelabs.com>
Fri, 15 Jun 2018 14:51:28 +0000 (14:51 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 15 Jun 2018 14:51:28 +0000 (14:51 +0000)

Trivial merge