Merge branch 'netslice'

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