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
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
Update for juju/names refactor part 1
Merge branch 'master' of https://github.com/juju/juju into 103-juju-names-refactor

Conflicts:
	cmd/juju/deploy.go
	juju/api.go
Promote DeployerTag to return a names.Tag
Remore some defers
fix the duplicated tests in apiserver/client
Integrated instance addresses and networks

Moved several items from the instance package
to the network/ package, renamed some
of them, and propagated the changes across:
 - instance.Address -> network.Address
 - instance.AddressType -> network.AddressType
 - instance.HostName -> network.HostName
 - instance.Ipv4Address -> network.IPv4Address
 - instance.Ipv6Address -> network.IPv6Address
 - instance.NetworkScope -> network.Scope
 - instance.Address.NetworkScope -> n.Address.Scope
 - instance.Network* -> network.Scope*
 - instance.NewAddress(es) -> network.NewAddress(es)
 - instance.HostPort -> network.HostPort
 - instance.Port -> network.Port
 - instance.Select*() -> network.Select*()
 - instance.SortPorts -> network.SortPorts

(I might have missed some, but you get the idea).

Also, some refactoring was done to split addresses and
ports implementation in separate files and test suites.

No other logic changes introduced - the rest is just
mechanically applying the changes above.

Moved environs/network to network/ and updated imports,
as suggested on the review.
Merge pull request #49 from dimitern/510-instance-addresses-and-networks-integration

Moved several items from the instance package
to the network/ package (used to be environs/network/),
renamed some of them, and propagated the changes across:
 - instance.Address -> network.Address
 - instance.AddressType -> network.AddressType
 - instance.HostName -> network.HostName
 - instance.Ipv4Address -> network.IPv4Address
 - instance.Ipv6Address -> network.IPv6Address
 - instance.NetworkScope -> network.Scope
 - instance.Address.NetworkScope -> n.Address.Scope
 - instance.Network* -> network.Scope*
 - instance.NewAddress(es) -> network.NewAddress(es)
 - instance.HostPort -> network.HostPort
 - instance.Port -> network.Port
 - instance.Select*() -> network.Select*()
 - instance.SortPorts -> network.SortPorts

(I might have missed some, but you get the idea).

Also, some refactoring was done to split addresses and
ports implementation in separate files and test suites.

No other logic changes introduced - the rest is just
mechanically applying the changes above.
charm: avoid use of /bin/cp

Isolated tests should avoid use of external commands when possible.

Also update utils dependency so that we can use the new fs package
containing the Copy function.