Merge "Wait until SSHABLE in volumes_extend test"