SSP-921 Adding fix for faulty IDs used in original demo data, associated
fix for demo data generator