added env uuid to the state object
envUUID on the state should be an environ tag
keep the environ tag as a tag in our getter
Merge pull request #401 from mattyw/add-uuid-to-state

added env uuid to the state object

Add the environment uuid to the state so that we can pass it on to AddEnvUser in a future pr
Merge pull request #402 from davecheney/157-always-truncate-configstore

configstore: use O_TRUNC when rewriting jenv file

Fixes LP #1348458

Because thumper was determined not to write a temporary file then move it, we have to ensure that iff we rewrite the .jenv file, the contents of the existing file are truncated before writing to prevent future readers of the file seeing corrupt data at the end of the file.
wip
Merge branch 'master' of https://github.com/juju/juju into 155-pass-environment-uuid-via-config-rather-than-generate-on-the-server

Conflicts:
	state/open.go
state: if no cannot provide a uuid, one will be assigned to you by the court