Merge "Fixes NSH OVS 2.5.90"
authorTim Rozet <trozet@redhat.com>
Thu, 11 Aug 2016 21:22:47 +0000 (21:22 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 11 Aug 2016 21:22:47 +0000 (21:22 +0000)

Trivial merge