add yosemite to macOSXSeries
moved action validation into context package; context tests not yet fixed
tests WIP
Modified PowerShell Charm resources dir.
merge parent, resolve conflicts
merge imminent future parent, fix conflicts
beef up tests
Merge branch 'uniter-context-export-flush' into uniter-action-context-2
finally fix crazy tests in not-very-happy-making way
Move types out to a third part to break the dependency cycle
state: more type shuffling
state: move moving things around
Merge branch 'master' into uniter-action-context-2
gb ./... passes
drop redundant runner code
address review
tests pass
Merge branch 'master' of https://github.com/juju/juju into 210-apiserver-state-refactor

Conflicts:
	cmd/jujud/machine_test.go
	cmd/jujud/upgrade.go
	cmd/jujud/upgrade_test.go
responding to review feedback
Merge branch 'master' of https://github.com/juju/juju into 210-apiserver-state-refactor