Fixes #217. Consistent parameter names.
Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop:
  Redirect file-like object, don't use isinstance
  Update JSON model with latest versions
  Allow for ETS to SkipTest for HTTP status of 429
  Fixed failing tests from pagination changes.
  Updated pagination tests to add expressions.
  Pagination changes from feedback.
  Updated pagination for jmespath ``result_key``s.
  Altered pagination to use ``more_results``.
  Add more special cases for case conversions
  Fix case conversion issue with SwapEnvironmentCNAMEs
  fix json -> xml request payload conversion
  Bumping version to 0.33.0
  Update route53 to the latest model
  Never catch a bare except clause
Updated PR to use botocore.xform_name
Allow additional parts of the user agent to be set
Merge branch 'settable-user-agent' into develop

* settable-user-agent:
  Allow additional parts of the user agent to be set
Update models to the latest version
Bump jmespath version to 0.3.0
Bumping version to 0.34.0
Merge branch 'release-0.34.0' into develop

* release-0.34.0:
  Bumping version to 0.34.0
  Bump jmespath version to 0.3.0
  Update models to the latest version
Mark Elastic Transcoder required params.
Remove Tags key from CreateSnapshot response

This is not supported by the API and was a mistake
in our model:

http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CopySnapshot.html
Merge branch 'ec2-tags-remove' into develop

* ec2-tags-remove:
  Remove Tags key from CreateSnapshot response
Merge pull request #246 from danielgtaylor/elastictranscoder-required-args

Mark Elastic Transcoder required params. Fixes #214, #246.
Add Cloudfront required params
Merge pull request #248 from danielgtaylor/cloudfront-required

Mark Cloudfront required params. Fixes #248.
Make pagination test more robust

Try a couple of times (up to 5) before failing the test.
This should make this integ test more robust.
Merge branch 's3-integ-page' into develop

* s3-integ-page:
  Make pagination test more robust
Reintroduce #221

Fixes aws/aws-cli#614.
Reintroduce handler unit tests

Originally from: 59c6cd9
Merge branch 'plus-s3-copy' into develop

* plus-s3-copy:
  Reintroduce handler unit tests
  Reintroduce #221