FS-10167: Separate commit for fixed to have cJSON compile cleanly, and be able to push commit upstream easily.