Merge "Fix multiArch installs where only some archs are available." into lmp-dev