State upgrade step: add env UUID to openPorts collection

Add an upgrade step targeting 1.22-alpha for the openPorts collection. Append the State Environment UUID to the document _id field. Add the following fields to the document: "env-uuid", "machine-id","network-name".

Refactor state/ports.go to use the new fields. Refactor mgo queries to included the environment UUID. Refactor state/upgrades.go helper function addEnvUUIDToEntityCollection to support collection specific upgrades by using variadic option functions. Skip failing upgrade tests which do not target current version.
Merge branch 'master' of https://github.com/juju/juju into migrate-openPorts

Conflicts:
	state/upgrades.go
Merge branch 'master' of https://github.com/juju/juju into migrate-openPorts

Conflicts:
	state/upgrades_test.go
	upgrades/steps122.go
	upgrades/steps122_test.go
Merge branch 'master' of https://github.com/juju/juju into migrate-openPorts
Merge branch 'master' of https://github.com/juju/juju into migrate-openPorts
Merge branch 'master' of https://github.com/juju/juju into migrate-openPorts
Add missing meterStatus upgrade step.
Merge branch 'master' of https://github.com/juju/juju into migrate-openPorts
Merge branch 'master' of https://github.com/juju/juju into migrate-openPorts
Merge pull request #1186 from waigani/migrate-openPorts

State upgrade step: add env UUID to openPorts collection

Add an upgrade step targeting 1.22-alpha for the openPorts collection. Append the State Environment UUID to the document _id field. Add the following fields to the document: "env-uuid", "machine-id","network-name".

Refactor state/ports.go to use the new fields. Refactor mgo queries to included the environment UUID. Refactor state/upgrades.go helper function addEnvUUIDToEntityCollection to support collection specific upgrades by using variadic option functions. Skip failing upgrade tests which do not target current version.

(Review request: http://reviews.vapour.ws/r/496/)