Start switch to using api for machine upgrade after restore
Merge branch 'master' into backup-ssh
Use juju status to get machine address
Use tag rather than whole machine
Remove unneeded retry loop
Error handling tweak
Use machine id rather than tag for PublicAddress
Use errors.Annotate
Change *everything* to errors.Annotate
Correct use of Annotate in a few places
Merge pull request #561 from voidspace/backup-ssh

Restore without access to state

juju-restore/restore: restore without access to the state.

Direct access to mongo via the state port will no longer be possible shortly. This PR changes restore to use the api instead of direct state access to get machine addresses (the only reason restore previously needed direct db access).