Merge branch 'master' with some bug fixing 39/8539/1 v7.0.1rc3
authortierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 30 Jan 2020 13:02:28 +0000 (13:02 +0000)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 30 Jan 2020 13:03:11 +0000 (13:03 +0000)
Change-Id: Iaea4acde172bca9fc2ff0f1a74290a1f7539496a
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge