If we have a replica set, set write-majority
MaaS provider should expose the bootstrap timeout options.
git ignore doesn't allow ./ style paths
Port login-env-urls over to git.

we lose all the history of the changes, but at least the patch is here.
I haven't run the test suite yet to ensure that all the changes are good,
but at least the patch applies.

This changes Login to return an ENV UUID and allows us to connect
to the API server under '/ENVIRONUUID/api' style urls.
Update the URLs to be at /environment/UUID/api instead of just /UUID/api.
Test that write-majority is not set when there's no replica set
review feedback
Update environprovider.go

Updated bootstrap-timeout to 1800 secs by default on MAAS provider.
Finish review comments
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
Update for juju/names @ ae9c025
Update for juju/names f41f9c1
Update to juju/names 7bf36b6
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
Increase dial timeout to wait for mongo
Merge remote-tracking branch 'origin/master' into 003-remove-filetesting