Merge branch 'contrail' into v7.0

Change-Id: I25cc61d45ac002c43875c610d34ac79e1d84457f
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>