MaaS provider should expose the bootstrap timeout options.
Update environprovider.go

Updated bootstrap-timeout to 1800 secs by default on MAAS provider.
Update to use new base txn struct
Merge branch 'master' of https://github.com/juju/juju into environ-resource-catalogs
Introduce new txn package and move transaction functionality from state
Update for juju/names @ ae9c025
Update for juju/names f41f9c1
Update to juju/names 7bf36b6
move charm.go from testing to charm/testing
Fix data races in state/apiserver tests
Merge remote-tracking branch 'origin/master' into 004-move-testing-charm

Conflicts:
	charm/bundle_test.go
charm: fix tests
Merge remote-tracking branch 'origin/master' into 004-move-testing-charm
state/apiserver: use charmtesting
Merge pull request #40 from rogpeppe/004-move-testing-charm

This is a prereq to pulling the charm package out of core.
Merge pull request #47 from axw/apiserver-test-race

Fix data races in state/apiserver tests
ActionResult captures the output and state of an action

test new Action.Fail() functionality

Add some tests for Action.Complete()
Updates per review from @mjs
Add ActionResultsForUnit and ActionResultsForAction to better manage specific prefixes for filtering
Add comments to explain structure of Action.Id() and ActionResult.Id()