Merge proposals dependent on lp://qastaging/~james-page/sademos/nc-lxd-fixes

lp://qastaging/~james-page/sademos/nc-lxd-fixes has no merge proposals.