Backport Mac installer fixes for git-based workflow (#2837)

1 file changed