MERGE: Partial patch for issue #11812: Take care of test_telnetlib.py