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
Updated version of golxc.
Merge branch 'master' of github.com:katco-/juju
wip
wip
Merge branch 'master' of https://github.com/juju/juju
wip
Merge branch 'master' of https://github.com/juju/juju into 170-state-apiserver-testing-drop-unused-field
Remove superfluous requirement for principal units only