Merge "Add 4o6 and 6o4 *no_odl* tests"
authorFlorin Coras <florin.coras@gmail.com>
Thu, 12 Jan 2017 17:09:00 +0000 (17:09 +0000)
committerGerrit Code Review <gerrit@fd.io>
Thu, 12 Jan 2017 17:09:00 +0000 (17:09 +0000)

Trivial merge