Unflake TestCatalog_ServiceNodes_Gateway

#### Overview of the Issue
TODO

#### Reproduction Steps

TODO Have not attempted to repro

### Operating system and Environment details

CircleCI

### Log Fragments

```
Failed
=== RUN TestCatalog_ListServices_Stale
=== PAUSE TestCatalog_ListServices_Stale
=== CONT TestCatalog_ListServices_Stale
TestCatalog_ListServiceNodes_NodeMetaFilter: writer.go:29: 2020-04-17T21:06:48.256Z [WARN] TestCatalog_ListServiceNodes_NodeMetaFilter-node-324: error getting server health from server: server=TestCatalog_ListServiceNodes_NodeMetaFilter-node-324 error="context deadline exceeded"
TestCatalog_ListServiceNodes_NodeMetaFilter: writer.go:29: 2020-04-17T21:06:48.262Z [INFO] TestCatalog_ListServiceNodes_NodeMetaFilter-node-324.server: federation state anti-entropy synced
TestCatalog_ListServiceNodes_NodeMetaFilter: writer.go:29: 2020-04-17T21:06:48.262Z [DEBUG] TestCatalog_ListServiceNodes_NodeMetaFilter-node-324.leader: stopped routine: routine="federation state anti-entropy"
TestCatalog_ListServiceNodes_ConnectDestination: writer.go:29: 2020-04-17T21:06:48.262Z [INFO] TestCatalog_ListServiceNodes_ConnectDestination-node-323.server: federation state anti-entropy synced
TestCatalog_ListServiceNodes_NodeMetaFilter: writer.go:29: 2020-04-17T21:06:48.282Z [WARN] TestCatalog_ListServiceNodes_NodeMetaFilter-node-324: error getting server health from server: server=TestCatalog_ListServiceNodes_NodeMetaFilter-node-324 error="rpc error making call: EOF"
TestCatalog_ListServiceNodes_NodeMetaFilter: writer.go:29: 2020-04-17T21:06:48.304Z [DEBUG] TestCatalog_ListServiceNodes_NodeMetaFilter-node-324.server: Skipping self join check for node since the cluster is too small: node=TestCatalog_ListServiceNodes_NodeMetaFilter-node-324
TestCatalog_ListServiceNodes_ConnectDestination: writer.go:29: 2020-04-17T21:06:48.305Z [DEBUG] TestCatalog_ListServiceNodes_ConnectDestination-node-323.server: Skipping self join check for node since the cluster is too small: node=TestCatalog_ListServiceNodes_ConnectDestination-node-323
TestCatalog_ListServiceNodes_NodeMetaFilter: writer.go:29: 2020-04-17T21:06:48.306Z [WARN] TestCatalog_ListServiceNodes_NodeMetaFilter-node-324: error getting server health from server: server=TestCatalog_ListServiceNodes_NodeMetaFilter-node-324 error="context deadline exceeded"
TestCatalog_ServiceNodes_Gateway: writer.go:29: 2020-04-17T21:06:48.315Z [ERROR] TestCatalog_ServiceNodes_Gateway-node-325.server.autopilot: error getting node metadata for server: id=a405fd6b-0a3a-ba40-7261-c618547319be error="no catalog entry for server ID "a405fd6b-0a3a-ba40-7261-c618547319be""
TestCatalog_ListServiceNodes_NodeMetaFilter: writer.go:29: 2020-04-17T21:06:48.323Z [DEBUG] TestCatalog_ListServiceNodes_NodeMetaFilter-node-324.server: Skipping self join check for node since the cluster is too small: node=TestCatalog_ListServiceNodes_NodeMetaFilter-node-324
TestCatalog_ListServiceNodes_NodeMetaFilter: writer.go:29: 2020-04-17T21:06:48.339Z [INFO] TestCatalog_ListServiceNodes_NodeMetaFilter-node-324.server.router.manager: shutting down
TestCatalog_ServiceNodes_Gateway: writer.go:29: 2020-04-17T21:06:48.415Z [ERROR] TestCatalog_ServiceNodes_Gateway-node-325.server.autopilot: error getting node metadata for server: id=a405fd6b-0a3a-ba40-7261-c618547319be error="no catalog entry for server ID "a405fd6b-0a3a-ba40-7261-c618547319be""
--- FAIL: TestCatalog_ListServices_Stale (27.19s)
```