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

Updated bootstrap-timeout to 1800 secs by default on MAAS provider.
Added basic doc for HA
Added singleton and voting sections and corrected

I addressed several redaction issues and added sections for
voting and singleton workers as commented by @rogpeppe
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
Made gramatical corrections suggested by @mjs
get rid of IsVirtual
Merge remote-tracking branch 'upstream/master' into 119-is-virtual
Revert resource catalog wor as this will be done downstream from the changes in this branch

This reverts commit 3f07858066fca5e9b5c167616988d7d87a618c4f.
Merge trunk and fix conflicts
Promote DeployerTag to return a names.Tag
Remore some defers
fix the duplicated tests in apiserver/client
added dry run support for upgrade-juju
wip
Merge remote-tracking branch 'upstream/master' into 104-juju-names-refactor-part-ii

Conflicts:
	state/megawatcher_internal_test.go
Apply https://code.launchpad.net/~gz/juju-core/gosshnew_1312940
Merge branch 'master' of https://github.com/juju/juju into 104-juju-names-refactor-part-ii