Merge "Remove deprecated bootstrap channel options"
authorTomas Slusny <tomas.slusny@pantheon.tech>
Tue, 22 Aug 2017 07:27:02 +0000 (07:27 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 22 Aug 2017 07:27:02 +0000 (07:27 +0000)

Trivial merge