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
Shut-off direct database access
Remove duplicated test
Update dependencies to use gomaasapi rev 53
Log ssh commands at trace level

Reduce noise for when we start
serialising tools in cloud-config.
Upgrade selection increments minor version by 1
cloudinit: s/AddFile/AddTextFile/, add AddBinaryFile
Merge pull request #586 from wallyworld/gomaasapi-rev53-trunk

Update dependencies to use gomaasapi rev 53

Fixes: https://bugs.launchpad.net/bugs/1190986
Merge pull request #590 from wallyworld/next-upgrade-version-trunk

Upgrade selection increments minor version by 1

Forward port from 1.20.

Fixes: https://bugs.launchpad.net/bugs/1359435
Use errors.Annotate
Change *everything* to errors.Annotate
Correct use of Annotate in a few places
Merge pull request #573 from axw/cloudinit-addfile-bytes

Change cloudinit.Config.AddFile to take []byte

In preparation for serialising tools in cloud-config for bootstrap
machines.

Also, log ssh commands at trace level

(Reduce noise for when we start serialising tools in cloud-config.)
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).