bdarnell Merge pull request #22563 from bdarnell/1.0-backports

release-1.0: Backports and updates for table lease leak