Merge "Upgrade jsoncpp to 1.9.5"