[HS3] Bugfixes to HS3 histfactoy_dist handling#22283

Phmonski wants to merge 2 commits into

root-project:masterroot-project/root:masterfrom

Phmonski:HS3patchPhmonski/root_fork:HS3patchCopy head branch name to clipboard