Merge "Bug 7636: Karaf4 migration"
authorRyan Vail <r.vail@cablelabs.com>
Fri, 17 Feb 2017 23:21:19 +0000 (23:21 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 17 Feb 2017 23:21:19 +0000 (23:21 +0000)

Trivial merge