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