Merge branch 'contrail' into master 10/9010/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 1 Jun 2020 06:23:06 +0000 (06:23 +0000)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 1 Jun 2020 07:18:54 +0000 (07:18 +0000)
Change-Id: I49a77de6c1d9ade3a932a315f00e59d628367cbe
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge