Add upgrade step to put the system identity back.

Conflicts:
	upgrades/upgrade_test.go
missing import.
state: cleaner env config generation in EnvironSuite

A small cleanup made after discovering testing.CustomEnvironConfig().
all: move MachineJob decl to state/multiwatcher
tests pass
cleanups
Setting default network bridge name on config creation.
Rename parseTag to tagToCollectionAndId
Update tests too
fix test not running
Review fix.
Style Guide Edit

Add "one space after period" to style guide.
Merge pull request #1190 from mjs/environ-test-config-cleanup

state: cleaner env config generation in EnvironSuite

A small cleanup made after discovering testing.CustomEnvironConfig().

(Review request: http://reviews.vapour.ws/r/500/)
Merge pull request #1197 from johnweldon/0-parseTag-refactor

Rename `parseTag` to `tagToCollectionAndId` for clarity

Minor feedback from previous PR - mechanical change

(Review request: http://reviews.vapour.ws/r/508/)
Merge pull request #1198 from waigani/styleguide-spaces

Style Guide Edit

Add "one space after period" to style guide.

(Review request: http://reviews.vapour.ws/r/509/)
testing/factory: added MakeEnvironment helper to Factory

To support testing of multi-environment scenarios.
testing/factory: removed formerly accurate comments
fix (final) test failure
Merge pull request #1193 from davecheney/220-remove-top-level-machinejob

state/multiwatcher: move top level MachineJob type

This PR cleans up the types that were temporarily moved to the top of the project during the `apiserver/params` / `state` transition.

`multiwatcher.MachineJob` is a terrible place to place this type, but it is currently required because it is referenced from the `multiwatcher` types like `MachineInfo`.

The next branch will clean up more of this nonsense.

(Review request: http://reviews.vapour.ws/r/503/)
state/backups: break dependency on state package