Merge base branch and resolve conflicts

Co-authored-by: andystaples <77818326+andystaples@users.noreply.github.com>

Author: Copilot

durabletask/client.py

@@ -419,10 +419,10 @@ def clean_entity_storage(self,
                              _continuation_token: Optional[pb2.StringValue] = None
                              ) -> CleanEntityStorageResult:
         self._logger.info("Cleaning entity storage")
-        
+
         empty_entities_removed = 0
         orphaned_locks_released = 0
-        
+
         while True:
             req = pb.CleanEntityStorageRequest(
                 removeEmptyEntities=remove_empty_entities,