rollup merge of #20089: rolftimmermans/json-control-chars-escape

Conflicts:
	src/libserialize/json.rs
Test fixes and rebase conflicts