Fix db versioning discrepancy within a single release cycle by re-numbering db-upgrade steps.

(cherry picked from commit df2371238e94fe8d51105bd828b6a54e0bbca5cc)
Signed-off-by: Stefan Negrea <snegrea@redhat.com>