Merge branch 'master' into v7.0 12/8512/2 v7.0.1rc2 v7.0.1rc3
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 21 Jan 2020 17:45:41 +0000 (17:45 +0000)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 21 Jan 2020 17:59:48 +0000 (17:59 +0000)
Change-Id: Id80cf649873e7678b1cda77102407be2b5628824
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

Trivial merge