Added some waits in replication2 from @buddhisthead
Added a hard 6 minute timeout to wait_for_unpingable