Backport of Add -type -f to the -find delete call as part of test collect reports into release/1.14.x

Backport of Add -type -f to the -find delete call as part of test collect reports into release/1.14.x #18673