Merge proposals dependent on lp://staging/~gary/juju-gui/fix-charm-panel-tests

lp://staging/~gary/juju-gui/fix-charm-panel-tests has no merge proposals.