Prepend EnvUUID to _id of each services doc.

Add an upgrade step, respective tests and a helper function to change
the _id field of each service doc from "id" to "envUUID:id".
Tweak a test that assumed sort order.
Factory methods using tags for user parameters.
Limit adding and sending metrics to the collect-metrics hook.
Merge branch 'master' of https://github.com/juju/juju into envuuid-serviceid
Merge branch 'master' of https://github.com/juju/juju into envuuid-serviceid
Merge branch 'master' into test-state-sorted

Conflicts:
	state/state_test.go

Just a simple "2 new imports added, ended up conflicting" issue.
Merge pull request #808 from jameinel/test-state-sorted

Tweak a test that assumed sort order.

Mongo turns out to always return the order that you inserted, but Tokumx returns keys in sorted order, but the test shouldn't be expecting an order (unless we are sorting in our Find), but AllServices doesn't care to sort.

http://reviews.vapour.ws/r/76/diff/
Merge branch 'master' of https://github.com/juju/juju into envuuid-serviceid
Merge pull request #802 from waigani/envuuid-serviceid

Prepend EnvUUID to _id of each services doc.

Add an upgrade step, respective tests and a helper function to change
the _id field of each service doc from "id" to "envUUID:id".
upgrades: move storage migration steps to 121a2
Remove environs.{VerifyStorage,CheckEnvironment}

environs.VerifyStorage was being called at
Bootstrap time; we're getting rid of provider
storage so this needs to go. Also, the related
CheckEnvironment function (which checks the
contents of the bootstrap-verify file) is only
called in tests.
Merge pull request #766 from tasdomas/add-metrics-limited-to-collect-metrics-hook

Limit adding and sending metrics to the collect-metrics hook.

Now that the hook tool add-metrics has been introduced, its usage will be limited to the collect-metrics hook. At this point the hook is only defined, not actually executed.
Merge pull request #815 from axw/no-verifystorage-take2

Remove environs.{VerifyStorage,CheckEnvironment}

environs.VerifyStorage was being called at
Bootstrap time; we're getting rid of provider
storage so this needs to go. Also, the related
CheckEnvironment function (which checks the
contents of the bootstrap-verify file) is only
called in tests.

Exact copy of #575, which the bot seems to be ignoring (maybe because I closed/reopened)
Merge pull request #755 from tasdomas/factory-owner-as-tag

Factory methods using tags for user parameters.
Add dependencies of dependencies to dependences.tsv
Merge pull request #810 from bz2/dependent_dependencies

Add dependencies of dependencies to dependences.tsv

The windows-required service package depends on the guy's osext package, and several of our subprojects have switched to the new gopkg.in location of gocheck.

http://reviews.vapour.ws/r/78/
provider/ec2: set UploadArches for tests

Ensure we upload AMD64 tools in tests,
regardless of host architecture.

Fixes https://bugs.launchpad.net/juju-core/+bug/1372961
Add comment about arch coverage
Merge pull request #822 from axw/lp1372961-ec2-tests-i386

provider/ec2: set UploadArches for tests

Ensure we upload AMD64 tools in tests,
regardless of host architecture.

Fixes https://bugs.launchpad.net/juju-core/+bug/1372961