Merge "Misc Changes"
authorSofia Wallin <sofia.wallin@ericsson.com>
Mon, 20 Mar 2017 09:23:43 +0000 (09:23 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 20 Mar 2017 09:23:43 +0000 (09:23 +0000)

Trivial merge