merge back the fixes to make the installers work from the vha branch to
the master branch.