[24.0 backport] un-skip history test and fix golden mismatches#4538

thaJeztah merged 2 commits into

docker:24.0docker/cli:24.0from

thaJeztah:24.0_backport_history_testthaJeztah/cli:24.0_backport_history_testCopy head branch name to clipboard