wip
wip
Merge branch 'master' of https://github.com/juju/juju into 141-names-refactor-part-x
wip
wip
Merge branch 'master' of https://github.com/juju/juju into 141-names-refactor-part-x

Conflicts:
	state/apiserver/admin.go
	state/initialize_test.go
	state/state_test.go
wip
Merge branch '158-lets-have-less-copies-of-the-tagged-authenticator-interface' into 141-names-refactor-part-x
wip
wip
fixed apiserver/common tests
wip
wip
wip
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 tests for hookCommand
Slight changes based on feedback

* defer restorer()
* slight change to error message checking
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