upstream merge
Faster _WriteEncodedString* methods in simple case

I "cheat" a bit here in the testing; as I have modified the string
generator to probabilistically remove special characters from the
generated string. Personally I think this is much more realistic; most
names of things don't have quotes or backslashes, etc.