Merge "Rebase: Account for ODL plugin upstream changes" into stable/colorado
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 25 Aug 2016 20:58:45 +0000 (20:58 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 25 Aug 2016 20:58:45 +0000 (20:58 +0000)

Trivial merge