Merge "test"
authorYaron Yogev <yaronyogev@gmail.com>
Thu, 27 Jul 2017 10:12:33 +0000 (10:12 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 27 Jul 2017 10:12:33 +0000 (10:12 +0000)

Trivial merge