tree d5824122cc53c1b04f19a732c9e00622c23679b5
parent 135c6bd2d29027420a8fb76711d119bca1241bf6
parent 17621f9c0c63d8a18494506d4f0659da933a48c2
author garciadeblas <gerardo.garciadeblas@telefonica.com> 1579556596 +0000
committer garciadeblas <gerardo.garciadeblas@telefonica.com> 1579556596 +0000

Merge branch 'master' into v7.0

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