KRACOEUS-7521: Fixing broken db
Merge pull request #503 from gathreya/fixDb

KRACOEUS-7521: Fixing broken db
KRACOEUS-7636: Fixing db scripts
Merge pull request #504 from gathreya/fixDb2

KRACOEUS-7636: Fixing db scripts
KCINFR-979: Fixing db scripts failure
Merge pull request #508 from gathreya/dbFix3

KCINFR-979: Fixing db scripts failure