Handle 404 in maasEnviron.StopInstances
Retry release individually in certain cases
state/multiwatcher: move remaining mutliwatcher related types
tests pass
remove unused types
remove vestigial type decl
Merge branch 'master' of https://github.com/juju/juju into 212-state-multiwatcher-info-types
responding to review feedback
Merge branch 'master' of https://github.com/juju/juju into 212-state-multiwatcher-info-types

Conflicts:
	apiserver/params/internal.go
gofmt
Merge pull request #1116 from davecheney/212-state-multiwatcher-info-types

state/multiwatcher: move remaining mutliwatcher related types

Followup to #1108 

It's pretty clear that these other types belong to the multiwatcher.
Improved error handling and test
Test recursive case
Log warnings for release failure
Improved svc.SetCharm and unit.SetCharmURL, added more tests
Logging improvement
Merge pull request #1113 from dimitern/lp-1301996-settings-lost-after-upgrade-charm

Improved svc.SetCharm and unit.SetCharmURL, added more tests

This is an attempt to fix issues like http://pad.lv/1301996
Merge branch 'master' into maas-404
Merge pull request #1127 from voidspace/maas-404

Handle missing nodes and permission errors when releasing MaaS nodes

When releasing MaaS nodes a 400, 403 or 404 response means that one or more nodes had errors and none have been released. The error is that the node is no longer available, so we can ignore the error (it's already been released) but we still need to release the other nodes. 

Fixes bug 1319016.
Merge branch 'master' into uniter-extract-filter