Merge proposals dependent on lp://staging/~gary/juju-gui/fix_sourcemap

lp://staging/~gary/juju-gui/fix_sourcemap has no merge proposals.