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 into 141-names-refactor-part-x

Conflicts:
	state/apiserver/common/environmachineswatcher.go
	state/apiserver/common/environmachineswatcher_test.go
	state/apiserver/common/environwatcher.go
	state/apiserver/common/environwatcher_test.go
	state/apiserver/common/interfaces.go
	state/apiserver/firewaller/firewaller.go
	state/apiserver/provisioner/provisioner.go
	state/apiserver/root.go
	state/apiserver/uniter/uniter.go
Fixed uniter and tests
fixed provisioner and upgrader
more keymanager tweaks
keymanager tests pass, ALL TESTS PASS
Merge branch 'master' of https://github.com/juju/juju into 141-names-refactor-part-x

Conflicts:
	state/apiserver/keymanager/keymanager.go