Merge "Fix missing NetconfNotificationCollector service"