Merge "Bug fixes and updates to fit ODL Boron SR0"
authorJose Lausuch <jose.lausuch@ericsson.com>
Fri, 14 Oct 2016 09:33:59 +0000 (09:33 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 14 Oct 2016 09:33:59 +0000 (09:33 +0000)

Trivial merge