Merge "NSB PROX test hang fixes"
authorRoss Brattain <ross.b.brattain@intel.com>
Tue, 3 Oct 2017 22:00:55 +0000 (22:00 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 3 Oct 2017 22:00:55 +0000 (22:00 +0000)

Trivial merge