Bug 23590: (QA follow-up) Fix some problems created by recent changes and updatedatab...