Merge "NVP-1109 and more fixes"
authorDavid Goldberg <gdavid@hpe.com>
Thu, 5 Jan 2017 17:42:38 +0000 (17:42 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 5 Jan 2017 17:42:38 +0000 (17:42 +0000)

Trivial merge