Merge pull request #2320 from BioDataAnalysis/THRIFT-5237

THRIFT-5344 follow-up fix to THRIFT 5237 Implement MAX_MESSAGE_SIZE and consolidate limits ...