juju/juju — pull request #467 by wallyworld (2014-08-05 14:19:34+00:00)
Title: Backport fix for replicaset startup from trunk

Done mainly to use longer 60s timeout, but also brings 1.20 implementation in line with trunk.