State: Migrate instanceId

Add an upgrade step to migrate the depricated "instanceid" machine
field into "instanceid" in the instanceData doc.
fix conflicts
State, upgrade step: Add EnvUUID to Sequence doc IDs

Adds an upgrade step to add the EnvUUID to sequence doc IDs.
State upgrade step: Add EnvUUID to cleanup docs.

Add an upgrade step which stringifies the cleanup doc (bson.ObjectId)
and prepends State's environment UUID. Update state.docID() to take an
interface and return a string.
generate-tools now merges metadata from different streams
Add a --download option to "juju backups create".
Add a --filename option.
Drop superfluous if statement.
Use a more meaningful (in help) "default" for --filename.
Upgrade gomaasapi to v 58

Fixes https://bugs.launchpad.net/juju-core/+bug/1384001
Add a recommendation to download backups.
Fix tests.
Merge pull request #1004 from perrito666/fix_1384001

Upgrade gomaasapi to v 58

Fixes https://bugs.launchpad.net/juju-core/+bug/1384001
fix conflicts
Merge branch 'master' of https://github.com/juju/juju into migrate-instanceid
Merge pull request #994 from waigani/migrate-cleanup

State upgrade step: Add EnvUUID to cleanup docs.

Add an upgrade step which stringifies the cleanup doc (bson.ObjectId)
and prepends State's environment UUID. Update state.docID() to take an
interface and return a string.
Merge pull request #1002 from ericsnowcurrently/backups-create-download

Add --download and --filename options to "juju backups create".
Merge pull request #916 from waigani/migrate-instanceid

State: Migrate instanceId

Add an upgrade step to migrate the depricated "instanceid" machine
field into "instanceid" in the instanceData doc.
Review fixes
Merge branch 'master' of https://github.com/juju/juju into migrate-sequences