Issue #14018: fix merge error
Issue #13886: Fix input() to not strip out supposedly-invalid input bytes.

Also fix sporadic failures in test_builtin due to dependence on whether the
readline module has previously been imported.