Merge "Use a longer test timeout in integration test"