Fixup migration #12 and support a target version when doing a database-sync

Change-Id: I54a80c96dc7376f6cd65fe5387e2bb813f12d94c