Add testing of the Thrift service implementation.
Merge remote-tracking branch 'upstream/master'