Merge "merged master"
authorKoren Lev <korenlev@gmail.com>
Wed, 4 Oct 2017 09:59:19 +0000 (09:59 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 4 Oct 2017 09:59:19 +0000 (09:59 +0000)

Trivial merge