Resolve branches in db migration scripts to G-3 release

Fixes bug #1129260

Change-Id: I5c70ee6d464f8fc0b2e4cdb4fc07464e150e10ff
Merge "Resolve branches in db migration scripts to G-3 release"