Merge "Revert "Migrate to karaf4 for the local karaf distribution""
authorRyan Goulding <ryandgoulding@gmail.com>
Thu, 23 Mar 2017 17:34:09 +0000 (17:34 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 23 Mar 2017 17:34:09 +0000 (17:34 +0000)

Trivial merge