packported all bundle changes from rje/windows_installer_test rebased onto master via copypaste :(