Issue #3282342 follow-up: Forward-port Guzzle updates, because the private testrunner doesn't like me today
