Merge "NSB Prox vPE Test"
authorRoss Brattain <ross.b.brattain@intel.com>
Fri, 6 Oct 2017 20:44:50 +0000 (20:44 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 6 Oct 2017 20:44:50 +0000 (20:44 +0000)

Trivial merge