merge master into v7.0 for v7.1.0

Change-Id: Ib7b7f0e2fcce82f6711391610d3395c61b3e06fc
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
1 file changed