Fix downgrade revision to make db migration linear

Fixes bug 1100767

The recent commit 7999282 creates db migration branches.
The migration timeline should be linear and this commit fixes it.

Change-Id: I94e1088352112e8c6ec989a54df83e61797b38c5
Merge "Fix downgrade revision to make db migration linear"