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)
Change-Id: I2ad9f8f84d76eeee570b082729e0d941b2341f09
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

Trivial merge