Merge pull request #635 from afs/thrift-update

JENA-1781: Update for Thrift 0.13.0, including workaround for THRIFT-5022