Merge branch 'master' into v7.0 00/8500/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 20 Jan 2020 21:43:16 +0000 (21:43 +0000)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 20 Jan 2020 21:43:16 +0000 (21:43 +0000)
commit9996434c9c09d437904132cf30c019232b044230
treed5824122cc53c1b04f19a732c9e00622c23679b5
parent135c6bd2d29027420a8fb76711d119bca1241bf6
parent17621f9c0c63d8a18494506d4f0659da933a48c2
Merge branch 'master' into v7.0

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