Merge branch 'master' into vnffg

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