wip
Merge branch 'master' of https://github.com/juju/juju into 170-state-apiserver-testing-drop-unused-field
Merge branch 'master' of https://github.com/juju/juju
Added ErrorActionPreference variable

* ErrorActionPreference is a powershell variable that dictates how errors should be handled. By default its set to "Continue". Setting it to "Stop" sis the equivalent of -e (Stop on error) in BASH.
* updated dependencies.tsv to include the WriteYaml windows fix in utils
Merge branch 'master' of https://github.com/juju/juju
Revert "Revert "Make FakeAuthorizer.AuthClient logic the same as apiserver.srvRoot""

This reverts commit e03852079e443e612709009f43eeb1d37fd421ae.

Conflicts:
	state/apiserver/keymanager/keymanager_test.go
	state/apiserver/usermanager/usermanager_test.go
Revert "Revert "AuthUnitAgent now derives from fa.Tag""

This reverts commit 54c3bd6483045cfa33992a6ddc8e271db5e2e7e5.

Conflicts:
	state/apiserver/uniter/uniter_test.go
	state/apiserver/upgrader/unitupgrader_test.go
reimplement FakeAuthorizer.AuthMachineAgent to match srvRoot
Merge branch 'master' of https://github.com/juju/juju into 166-apiserver-common-authoriser-remove-getauthentity-method
gofmt
Added support for a metrics collections

insert a batch of metrics instead of one at a time

only allow metrics to be added if the unit is alive
use right version of charm as per master
Merge pull request #466 from mattyw/add-metric-collection-to-state

Added support for a metrics collections

Added a metric collection for storing unit metric in the state server

Only support for:

* adding new metrics
* getting lists of unsent metrics
* setting the sent flag
Clean up the backups package.
Address review comments from axw.
Rename backup to backups.
Clean up DBConnInfo a bit.
Add a test for the files that will be backed up.
Move runCommand() to core utils.
Escalate log levels in backups and add more logged info.