Patch version number in some bootstrap tests to allow tests to pass with non-dev version number
Set build number rather than minor version to simulate dev version
utils/ssh: set ServerAliveInterval option

Bootstrapping Azure was seeing the CLI
hang at "apt-get upgrade" with no further
output or command completion. Inspection
of cloud-init-output.log on the server
showed that the bootstrap procedure
completed successfully.

The problem appears to be due to the
"apt-get upgrade" taking a long time on
Azure: over 6 minutes. This inactivity
causes the ssh server to discontinue sending
output to the client. To resolve the issue
we need to ensure the ssh client sends
keepalive messages to the server.

Fixes https://bugs.launchpad.net/juju-core/+bug/1316185
Add missing suite setup/teardown, etc.
Merge pull request #191 from wallyworld/version-1-20-fix

Patch version number in some bootstrap tests

Patch the version.Current to a dev version since upload-tools is not allowed for non-dev versions.
Merge pull request #205 from axw/moar-test-cleanup

Add missing suite setup/teardown, etc.
Merge pull request #196 from axw/lp1316185-ssh-keepalive

utils/ssh: set ServerAliveInterval option

Bootstrapping Azure was seeing the CLI
hang at "apt-get upgrade" with no further
output or command completion. Inspection
of cloud-init-output.log on the server
showed that the bootstrap procedure
completed successfully.

The problem appears to be due to the
"apt-get upgrade" taking a long time on
Azure: over 6 minutes. This inactivity
causes the ssh server to discontinue sending
output to the client. To resolve the issue
we need to ensure the ssh client sends
keepalive messages to the server.

Fixes https://bugs.launchpad.net/juju-core/+bug/1316185
Merge remote-tracking branch 'upstream/master' into 121-networkinterfaceswatcher