Issue #28846: Various installer fixes
6 files changed