Merge proposals dependent on lp:~diegosarmentero/ubuntuone-windows-installer/lint-fix

lp:~diegosarmentero/ubuntuone-windows-installer/lint-fix has no merge proposals.