tree bcf55125c3b777c8d48cfc7da19c115afc5dbb18
parent e5050fb4bcd04eee1011b677b1c4c80159bde008
parent bb631bed423b0cc47193108e705d354ed43625b0
author garciadeblas <gerardo.garciadeblas@telefonica.com> 1603205772 +0000
committer garciadeblas <gerardo.garciadeblas@telefonica.com> 1603205778 +0000

Merge remote-tracking branch 'origin/master' into sol006

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