Merge branch 'master' of https://github.com/juju/juju into 170-state-apiserver-testing-drop-unused-field
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 172-state-apiserver-faketesting-refactor
Merge branch 'master' of https://github.com/juju/juju into 172-state-apiserver-faketesting-refactor
Merge branch '174-state-apiserver-faketesting-remove-get-auth-entity' into 172-state-apiserver-faketesting-refactor

Conflicts:
	state/apiserver/environment/environment_test.go
	state/apiserver/testing/fakeauthorizer.go
	state/apiserver/uniter/uniter_test.go
	state/apiserver/usermanager/usermanager_test.go
gofmt
tweak
Merge pull request #515 from davecheney/172-state-apiserver-faketesting-refactor

state/apiserver/testing: FakeAuthorizer fixups

This PR removes three of the boolean fields on FakeAuthorizer. There is more work to be done, but this is a good point to land what I have done so far.

Discussion: https://lists.ubuntu.com/archives/juju-dev/2014-July/003104.html