Merge pull request #12284 from vjpai/qps_cleanup

QPS test: remove some pre-C++11-style workarounds