PS-10070, PS-10083 [8.4]: fixes for Apple clang#5942

jankowsk wants to merge 2 commits into

percona:8.4percona/percona-server:8.4from

jankowsk:PS10070-8.4-fix_apple_buildjankowsk/percona-server:PS10070-8.4-fix_apple_buildCopy head branch name to clipboard