Issue #15663: merge build-installer.py changes