THRIFT-2859: compilation fix, C++11 removed from JSON generator
Merge branch 'master' into cpp_v2