Merge proposals dependent on lp://staging/~mikemc/ubuntuone-windows-installer/fix-1024518

lp://staging/~mikemc/ubuntuone-windows-installer/fix-1024518 has no merge proposals.