Bug 18235: (QA follow-up) Make db update idempotent