OFC-1486 - NPE loading code list items for not persisted surveys
OFC-1487 - RDB generator creates duplicate code list tables