benesch Merge pull request #23153 from benesch/cp2.0-23136

cherrypick-2.0: storage: plug an iterator leak

Latest commit 59246c8

Feb 27, 2018