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