mp-0.1.427: Wait for query timeout during shutdown (#1322)

Wait for at least as long as the query timeout duration during server
shutdown. Set query timeout to 10s in integration tests.