Merge "Make doEditContent call $dbw->rollback() if exception happens"