Merge branch 'master' of https://github.com/juju/juju into migrate-allwatcher-take2
Fixed lp:1395908 - disabled NICs from lshw stay disabled
When writing metadata, copy any released metadata to the legacy index file
Merge pull request #1249 from wallyworld/generate-old-simplestreams-index

When writing metadata, copy any released metadata to the legacy index file

Fixes: https://bugs.launchpad.net/juju-core/+bug/1396981

The legacy index.json file needs to be written out to contain any released metadata. This allows the current release scripts to work.

(Review request: http://reviews.vapour.ws/r/560/)
Merge pull request #1247 from dimitern/lp-1395908-respect-disabled-lshw-nics

Fixed lp:1395908 - disabled NICs from lshw stay disabled

With this fix the MAAS provider takes the disabled="true"
attribute of <network/> elements into account when deciding
which should be the primary network interface on the machine.
The end result is juju-br0 will be configured to use the first
enabled network interface.

Live tested on MAAS.

(Review request: http://reviews.vapour.ws/r/558/)
Add a test for missing files.
Make the logs optional.
Add TODO comments.
Log missing files.
Add one more TODO.
Merge pull request #1258 from ericsnowcurrently/backups-missing-logs

Make log files optional in a backup archive.

https://bugs.launchpad.net/juju-core/+bug/1398448

(Review request: http://reviews.vapour.ws/r/572/)
Merge branch 'master' of https://github.com/juju/juju into migrate-allwatcher-take2