UPSTREAM: <drop>: Double the global timeout if performing a global list

In 3.6, users still on etcd may be seeing large list calls take in
excess of 1 minute (the hard limit). In 3.7, all users will be on etcd3
and protobuf and we expect times to drop by an order of magnitude.
Since our largest in the wild clusters are taking about 1 minute 3
seconds, double the global timeout limit for global lists only for 3.6,
and in 3.7 this will no longer be necessary.

Author: smarterclayton