worker/uniter/jujuc: fix TestLocks test
state/watcher: fix test timeout
merge 345-fix-satisfies-checker
merge trunk
cmd/jujud: fix MachineSuite.TestHostUnits race condition
testing: revert ShortWait
merge parent
relation-set now accepts 0 args
cmd/bootstrap: integrated sync logic
cmd/bootstrap: changes after review
cmd/bootstrap: handled review
unexport ParseTag
cmd/bootstrap: merged trunk and fixed syncing-upload-order
cmd/bootstrap: merged latest trunk
cmd/bootstrap: improved testing
[r=themue] cmd/bootstrap: integrate syncing

After the CL moving the synchronization logic into an
own package this CL now checks if tools can be found
during bootstrap. If this is not possible it will use
the synchronization logic and then retries the 
bootstrapping.

https://codereview.appspot.com/11910043/
merge parent
[r=fwereade],[bug=1199886] jujuc: relation-set compatibility

lp:1199886 (relation-set should accept 0 args)

https://codereview.appspot.com/11808045/
merge parent
merge trunk