Cherry pick fixes related to macos_unit_tests (3.21)#5888

craigcomstock wants to merge 9 commits into

cfengine:3.21.xcfengine/core:3.21.xfrom

craigcomstock:macos-unittest-fixes/3.21craigcomstock/core:macos-unittest-fixes/3.21Copy head branch name to clipboard