Merge proposals dependent on lp:~jderose/ubiquity/fix-1161943

lp:~jderose/ubiquity/fix-1161943 has no merge proposals.