Merge "Make non-exception rollback() calls safer"