LRDCOM-11352 Fix upgrade to avoid service calls
LRDCOM-11352 Remove duplicate sql
LRDCOM-11352 create unique index
LRDCOM-11352 Regen