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

This reverts commit 25fa538e051d06cfa4c3f23dc6617d090211cfcf.

Change-Id: I2dc58cde1cc2ed1397c644356c8bca8680ab1110
Signed-off-by: Michele Carignani <michele.carignani@etsi.org>
5 files changed