Merge branch 'master' into sol006

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