reboot uniter and tool 

This PR is a combination of:

https://github.com/juju/juju/pull/831
https://github.com/juju/juju/pull/832