Modified upstart config to ensure proper log perms.
Modified Upstart config to grant correct permissions to agent logs.
Merge branch 'master' of https://github.com/juju/juju into 1286518-log-perms-2
Updated tests to reflect use of script.
Corrected search for exec block to work with new script block.
Finally got tests working. Removed unnecessary panic.
Merge branch 'master' of https://github.com/juju/juju into 1286518-log-perms-2

Conflicts:
	environs/cloudinit/cloudinit_test.go
Merge pull request #245 from katco-/1286518-log-perms-2

1286518 log perms 2
Update the add machine api to accept both environment name and UUID.
Add a method to get the environment uuid from the client api connection.
Update dependencies.tsv
Use the environment uuid instead of the name.
Merge pull request #248 from davecheney/128-update-ssh-terminal

Update dependencies.tsv

Fixes https://bugs.launchpad.net/bugs/1337063
Merge pull request #249 from howbazaar/env-cmd-add-machine

Update add machine to use environment UUID

This is the start of the work to hide the EnvName from the environment command base.

This will allow us to specify an environment using either other command line parameters or environment variables to better allow scripts to call juju without having a $(JUJU_HOME)/environments directory.
Renamed doc/planning to doc/contribution.
Changed to plural after review.
Merge pull request #252 from TheMue/rename-doc-planning-to-contribution

Renamed doc/planning to doc/contribution.

Simple renaming of the directory `/doc/planning` to `/doc/contribution`.
SetPreferIPv6Addresses implemented
Merge pull request #254 from dimitern/dummy-provider-ipv6

provider/dummy: Allow IPv6 addresses for instances and storage

Added SetPreferIPv6Addresses() method on the dummy provider
that controls whether to add IPv6 addresses to started
instances and what storage URLs to use (IPv4 or IPv6).
Also sets the network.PreferIPv6 flag, which influences
addresses selection to prefer IPv6 addresses when available.