Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""