Merge branch 'master' into sol006 05/8405/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 16 Dec 2019 16:24:03 +0000 (17:24 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 16 Dec 2019 16:25:04 +0000 (17:25 +0100)
Change-Id: Iaa1a32bb76c06720e941b6d801da72b1b1ad9af4
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

Trivial merge