redelete old java thrift
merge fixes