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)
commit607aa724fd2f50287deea1d065f7bcad10e28df7
treefe1cc16ddb79baf9da71974c13650c7b63100204
parentd736502958dac29bb85cad5b123a8e0f29707151
parentbcb78331f0e8a321585fc7b84e9b7857a90ecb6c
Merge branch 'master' into v7.0

Change-Id: I2f681df4119c974dc076f667db20c01a473d9d55
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>