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
Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of https://github.com/juju/juju
Fix wrench build on Windows
Start switch to using api for machine upgrade after restore
Merge branch 'master' into backup-ssh