JSON decoding bug fixed in 2.3.2, remerged in 2.3.5 and still in 2-3-stable branch

Can someone please take a peek at this ticket [1]? I've ported a patch
that wast applied to the 2.3.2 stream, but didn't make it into the 2-3-
stable branch, so releases, such as 2.3.5 regressed. I'd like to get
this fix into 2.3.6, so I can eliminate some monkey patches.

Thanks - Nathan