Issue #14018: Backport OS X installer updates from 3.3.
7 files changed