Merge proposals dependent on lp:~jameinel/bzr/junk-test

lp:~jameinel/bzr/junk-test has no merge proposals.