Added setting of a default NS if not propagated and not in the template (OMS-444)
Cleanup