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