If we have a replica set, set write-majority
Test that write-majority is not set when there's no replica set
Test setting of WMode
Set J:true unconditionally for the mongo session
Merge branch 'master' of https://github.com/juju/juju into write-majority
delete testing/filetesting; use github.com/testing/filetesting instead
Start using networks constraints for deployments:
- "juju deploy" uses --networks=net1,net2 argument to specify
  requested networks (required to be enabled), while "softer"
  requrements only for instance selection can be given with
  --constraints networks=net2,^net3 (positive and negative)
- updated help topics
- changed MachineConfig to only have Networks (to include)
- changed RequestedNetworks in state for machines and services
  to have only a list of included networks
- changes in the MAAS provider to use both requested networks
  and network constraints for acquireNode
- provisioner API and worker uses requested networks as
  from a single slice, and ProvisioningInfo-related code was
  updated similarly
- juju status changed to show only requested networks as enabled
  and networks from constraints as disabled for a service
- fixes in lots of places (mostly tests)

There are a lot of changed files, but most of them are just
fixed tests and code using NewMachineConfig or AddService,
whose arguments have changed.
sortimports
Merge remote-tracking branch 'origin/master' into 003-remove-filetesting

Conflicts:
	utils/zip/zip_test.go
	worker/uniter/charm/manifest_deployer_test.go
	worker/uniter/relationer_test.go
	worker/uniter/uniter_test.go
Fixed conflicts and merged master
Increase dial timeout to wait for mongo
Merge pull request #13 from dimitern/501-use-networks-constraints

- in "juju deploy"
- update help topics
- change MachineConfig to only have Networks (to include)
- change RequestedNetworks in state for machines and services
  to have only a list of included networks
- changes in the MAAS provider to use both requested networks
  and network constraints for acquireNode
- provisioner API and worker uses requested networks as
  from a single slice, and ProvisioningInfo-related code was
  updated similarly
- fixes in lots of places (mostly tests)

There are a lot of changed files, but most of them are just
fixed tests and code using NewMachineConfig or AddService,
whose arguments have changed.
Merge remote-tracking branch 'origin/master' into 003-remove-filetesting
Merge pull request #31 from rogpeppe/003-remove-filetesting
Merge branch 'master' into write-majority
Merge pull request #17 from voidspace/write-majority
Actions() schema getter added to Charm interface.

BZR commit history for this change has been lost, but types that
implement Charm now must also implement an Actions() method.  This
method should typically retrieve the charm.Actions value from the type.

The Actions is also now stored in, and properly retrieved from the Charm
documents in State.
charm.ReadActionsYaml now uses a transform rather than in-place map editor to strip map[interface{}]interface{} values into usable map[string]interface{}s.  A few tests have been added and other minor fixes applied.
Added better test cases for map[interface{}] cleaner.
New cleanse function replaces all functionality of previous recursion.