THRIFT-563 Support for Multiplexing Services on any Transport, Protocol and Server

Patch: Rob Slifka
Fixes broken build due to previous patch
THRIFT-1899 Delphi: Support for Multiplexing Services on any Transport, Protocol and Server

Patch: Jens Geyer