Merge branch 'master' of https://github.com/juju/juju into 135-names-refactor-part-viii

Conflicts:
	environs/cloudinit_test.go
	provider/azure/environ_test.go
common.Watch now takes a Tag
Merge branch 'master' of https://github.com/juju/juju into 135-names-refactor-part-viii
AgentConfigParams.Tag is now a names.Tag
wip
Merge branch 'master' of https://github.com/juju/juju into 135-names-refactor-part-viii
wip
address more TODOs
responding to review feedback, add tests, fix the tests that were there but didn't run
- Use the recently introduced function golxc.GetDefaultLXCContainerDir() for getting the default LXC path.
	- This commit fixes LP: #1329049
prefer-ipv6 passed through to agent config
Merge pull request #307 from dimitern/prefer-ipv6-agent-config

Pass prefer-ipv6 flag through agent config

This builds upon the previous PR adding the prefer-ipv6 environ
config setting. Now, the prefer-ipv6 flag is passed through further
to the agent config, so the agents can initialize the network package
with it even before connecting to the API/state servers (no environ
config yet).
Updated dependencies for point golxc to the latest revision.
Changed owner of machine-x.log to syslog:syslog to fix regression in all-machines.log.
Reduce 'flakiness' of Action test on worker Filter

worker/uniter/filter_test.go no longer cares what order Actions arrive
in.  We think that indeterminate latency might account for occasional
out-of-order errors in this test.
Merge pull request #312 from binary132/flaky-action-queue-test-fix

Reduce 'flakiness' of Action test on worker Filter

worker/uniter/filter_test.go no longer cares what order Actions arrive
in.  We think that indeterminate latency might account for occasional
out-of-order errors in this test.
Don't trace a maybe null error
Add tests for manual provisioning.
Merge branch 'master' of https://github.com/juju/juju into 135-names-refactor-part-viii

Conflicts:
	agent/agent_test.go
Merge pull request #314 from howbazaar/fix-manual

Fix the break in add-machine with ssh placement

Added a few tests too.