Merge proposals dependent on lp://qastaging/~bluesabre/xubuntu-default-settings/b2_fixes

lp://qastaging/~bluesabre/xubuntu-default-settings/b2_fixes has no merge proposals.