Merge branch 'master' into v7.0 78/8978/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Wed, 27 May 2020 08:01:49 +0000 (08:01 +0000)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Wed, 27 May 2020 08:02:43 +0000 (08:02 +0000)
Change-Id: I2f681df4119c974dc076f667db20c01a473d9d55
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

Trivial merge