Merge "Last Release updates before tag (Fraser)" into stable/fraser
authorCedric Ollivier <cedric.ollivier@orange.com>
Fri, 20 Apr 2018 13:57:08 +0000 (13:57 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 20 Apr 2018 13:57:08 +0000 (13:57 +0000)

Trivial merge