Fix up some unit tests to work with the new Payload objects in botocore.
Merge branch 'develop' of github.com:aws/aws-cli into develop
Update s3 test with latest payload botocore refactor

The bug in httpretty it still there, but we can just set the value
to None rather than a string.  I also filed an issue about this
on the httpretty github repo.
Make doc checking test less strict

Until bcdoc rendering issues have been worked out.
Escape double quotes on windows
Add proper escape transforms when on windows
Merge branch 'fix-windows-integ' into develop

* fix-windows-integ:
  Add proper escape transforms when on windows
  Escape double quotes on windows
  Make doc checking test less strict