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
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
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
Tweak some mongo timeouts and refactor multiple bits of mongo functionality into a single mongo package
Re wrote backup in go

Previously restore was a cmd plugin writen in bash.
Backup was implemented as a go function, still not in use.
Tests where added since the previous implementation had none.
backup package includes:
 * BackUp function, which performs the actual back up.
 * tarFiles which creates a tar or tar.gz/tgz depending
on the output file name given.
 * runCommand which is a convenience function to simplify testing
since the back up process requires calling external executable
mongoexport.
added a summary and link to the docs in the readme
Update environprovider.go

Just bootstrap-timeout option will be exposed, until this default value is increased
on a per-provider basis.