Merge "Avoid use of rollback() in WikiPage::doEditContent()"