Merge branch 'master' into uv_core_transport

test/cpp/qps/server_async.cc

@@ -57,7 +57,7 @@ namespace testing {
 
 template <class RequestType, class ResponseType, class ServiceType,
           class ServerContextType>
-class AsyncQpsServerTest : public Server {
+class AsyncQpsServerTest GRPC_FINAL : public grpc::testing::Server {
  public:
   AsyncQpsServerTest(
       const ServerConfig &config,

test/cpp/qps/server_sync.cc

@@ -31,8 +31,6 @@
  *
  */
 
-#include <thread>
-
 #include <grpc++/security/server_credentials.h>
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>