Merge proposals dependent on lp://staging/~frankban/charms/trusty/juju-gui/test-fixes

lp://staging/~frankban/charms/trusty/juju-gui/test-fixes has no merge proposals.