Merge lp://staging/~mthaddon/juju-deployer/fix-test-failures into lp://staging/juju-deployer

Fix test failures

Fix test failures.

Without this update we're seeing test failures on focal (where bzr is brz). Also seeing failures in juju 1 deployments as below.

Traceback (most recent call last):
  File "/usr/bin/juju-deployer", line 9, in <module>
    load_entry_point('juju-deployer==0.11.0', 'console_scripts', 'juju-deployer')()
  File "/usr/lib/python3/dist-packages/deployer/cli.py", line 140, in main
    run()
  File "/usr/lib/python3/dist-packages/deployer/cli.py", line 250, in run
    importer.Importer(env, deployment, options).run()
  File "/usr/lib/python3/dist-packages/deployer/action/importer.py", line 307, in run
    self.wait_for_units(ignore_errors=ignore_errors)
  File "/usr/lib/python3/dist-packages/deployer/action/importer.py", line 278, in wait_for_units
    services=self.deployment.get_service_names(), on_errors=on_errors)
  File "/usr/lib/python3/dist-packages/deployer/env/go.py", line 279, in wait_for_units
    services=services, on_errors=on_errors).run(callback)
  File "/usr/lib/python3/dist-packages/jujuclient/watch.py", line 167, in run
    if self.complete() is True:
  File "/usr/lib/python3/dist-packages/deployer/env/watchers.py", line 114, in complete
    message != "running update-status hook":