Merge "Fix for ETSI_CATALOG onboarding NS package"