Squash Grizzly database migrations

Fixes bug #1072949

Change-Id: I07e4d1454141c9011aacdec3a4eb01a3ea1936c9
Merge "Squash Grizzly database migrations"