Backport fix for replicaset startup from trunk

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