juju/juju — pull request #1263 by ericsnowcurrently (2014-12-03 19:37:33+00:00)
Title: Use the proper machine ID in backup and restore.

To accomplish this we add a new API server resource, "machineID", which is pulled from the agent conf. At that point backups can use that value when creating a new archive. Once the archive has the correct machine ID, we can use that ID in restore.

Fixes https://bugs.launchpad.net/juju-core/+bug/1398837 (and partially 1389362).