Merge branch 'master' of https://github.com/juju/juju into id-prov

Conflicts:
	state/apiserver/admin.go