extend tests to check THRIFT-1679 and THRIFT-1821
Merge ../thrift into trunk