merge master into v7.0 for v7.1.0

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