Merge "Make Database::rollback() also suppress callback errors"