[release-1.28] Fix on-demand snapshots timing out; not honoring folder

[brandond]

Proposed Changes

• Backport Fix on-demand snapshots timing out; not honoring folder #9984
• Fix on-demand snapshots not honoring folder
  Also fix etcd s3 tests to actually check that the files are saved to s3 🙃
• Fix 10 second etcd-snapshot request timeout
  The default clientaccess request timeout is too short. Wait longer by default, and add the s3 timeout if s3 is enabled.

Types of Changes

bugfix

Verification

See linked issue

Testing

yes

Linked Issues

• [Release-1.28] - etcd-snapshot save ignores s3-folder param provided and saves only in s3-bucket location #9996
• [Release-1.28] - etcd-snapshot save times out in 10 seconds the first try #9998

User-Facing Change

Further Comments

[codecov]

Codecov Report

Attention: Patch coverage is 36.36364% with 7 lines in your changes are missing coverage. Please review.

Project coverage is 36.24%. Comparing base (b33e710) to head (90db403).

Files	Patch %	Lines
pkg/etcd/snapshot_handler.go	0.00%	4 Missing ⚠️
pkg/cli/etcdsnapshot/etcd_snapshot.go	57.14%	3 Missing ⚠️

Additional details and impacted files

@@               Coverage Diff                @@
##           release-1.28    #9994      +/-   ##
================================================
- Coverage         40.74%   36.24%   -4.50%     
================================================
  Files               158      155       -3     
  Lines             17320    13868    -3452     
================================================
- Hits               7057     5027    -2030     
+ Misses             9020     7864    -1156     
+ Partials           1243      977     -266     

Flag	Coverage Δ
e2etests	36.24% <36.36%> (-9.88%)	⬇️
inttests	?
unittests	?

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[brandond]

virtualbox image for btrfs test appears to be broken; merging