THRIFT-2505 fix apache license header
Merge ../thrift