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

This reverts commit 420ce6cb281ad3c3d45f14c36e1fc4428895bee8.

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