Merge PR #38732 into master

* refs/pull/38732/head:
	client: fire the finish_cap_snap() after buffer being flushed
	client: simplify the iterating code
	client: remove unused _flushed_cap_snap
	client: clean up the code

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge