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
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.
Merge pull request #309 from davecheney/135-names-refactor-part-viii

135 names refactor part viii

More string -> names.Tag refactorings

Address the uses of strings as tags in agent configuration. There appears to be a strong case that agentConfig.Tag() should return a names.MachineTag only, but this has not been addressed yet.

Address and remove many TODOs, the remainder have been fought back to the state package where you still must request state objects via string, rather than tags. This is coming next
Merge pull request #313 from katco-/lp-1339715

Changed owner of machine-x.log to syslog:syslog to fix regression in all...

...-machines.log.