Merge branch 'netslice' 30/6930/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 20 Nov 2018 16:24:31 +0000 (17:24 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 20 Nov 2018 16:24:31 +0000 (17:24 +0100)

Trivial merge