Merge proposals dependent on lp:~vila/bzr/final-cleanup

lp:~vila/bzr/final-cleanup has no merge proposals.