[PLAT-3044, PLAT-2286] Temporary measure to make sure the injected values include both a UniqueId and ExternalIdBundle form for primitives until the data is handled consistently throughout.