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
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
FIX 1356899

Re-propose reverted branch 2d129e3 (manual provision with custom key).
Re-add a line of bash script that was accidentally deleted.
Add metadata for state backups.
Remove superfluous code and track backup origins.
Add an extra backup timestamp field and rename a file.
Fix docstrings.
errors.Errorf -> errors.Annotate
Fix a copy-and-paste docstring issue.
Test for the actual env ID rather than a bad regex.
archived -> stored
backup -> backups
Fix formatting.