Bug 17178: (QA follow-up) Make DB update idempotent