fix merge conflicts in readfuncs.c and outfuncs.c

fix merge conflicts in readfuncs.c and outfuncs.c

There's a lot of overlap with new nodes for parallel query, so
hopefully this was merged correctly. Also, a lot of differences
w.r.t. upstream are due to portable_input all over the code, but
that could easily be minimized by moving the check into the
macros at the beginning (as we only need to do that for OIDs).