Dev env fixes
Created by: bortloff
Lazy backported fix from upstream https://github.com/guzzle/guzzle/commit/fcae91ff31de41e312fe113ec3acbcda31b2622e .
Created by: bortloff
Lazy backported fix from upstream https://github.com/guzzle/guzzle/commit/fcae91ff31de41e312fe113ec3acbcda31b2622e .