Merge branch 'contrail' into v7.0 95/8995/2 v7.1.0rc5
authortierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 28 May 2020 16:07:06 +0000 (16:07 +0000)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 28 May 2020 16:07:47 +0000 (16:07 +0000)
Change-Id: I25cc61d45ac002c43875c610d34ac79e1d84457f
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge