Add changes from Thrift commits up to cf18e91831507f20ac777262174288d64e3f5bbe