Manually syncing schema scripts for merged DB based on some changes that have happened in master since we branched.

Issue: BMS-90