Merge: #5713: One more test_smtplib timing fix.