[google|storage] Reintroduce workaround for excon headers issue while ke...

...eping fix where file_data was not being saved.

The last commit undid the excon headers issue workaround and but fixed another issue. This merges them.