[WIP] Move to guzzle4

This branch is based on the other base PR clean up