Re-enabling NS primitives, config-primitive over service-primitive, clean-up

Change-Id: I5995165ea9baadc1870cd2ae5bffc4a59a866df0
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
5 files changed