Review refactor of merge cleanups

[Simon Cooper]

Could I have a review of https://github.com/apache/lucene/pull/14977
please? It refactors how cleanup works after merges so the finishMerge
method gets called in all cases

SimonC