Merge branch 'master' into v7.0 60/8960/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 22 May 2020 14:27:05 +0000 (14:27 +0000)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 22 May 2020 14:28:20 +0000 (14:28 +0000)
commitd736502958dac29bb85cad5b123a8e0f29707151
treedf8186de1e9ef9f1dfa356b522a1c8ef18b48988
parent80ef8571ea21900bce2d73554c56b1ccbf4c7072
parentf6a4f77b98e5f05b74938b44bcbb2ed148e4941a
Merge branch 'master' into v7.0

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