Merge branch 'develop', remote-tracking branch 'origin' into develop
Merge branch 'release-1.2.6' into develop

* release-1.2.6:
  Bumping version to 0.26.0
  Update models to latest version
Fix handling of empty values for required list parameters.  Fixes https://github.com/aws/aws-cli/issues/524.
Fix handling of unflattened map parameters in query services.  Part of the fix for https://github.com/aws/aws-cli/issues/407.
Add a botocore-specific test for updated handling of maps in query interfaces.
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'fix-awscli-407' of git://github.com/garnaat/botocore into garnaat-fix-awscli-407
Merge branch 'fix-awscli-524' of git://github.com/garnaat/botocore into garnaat-fix-awscli-524
Update service model to the latest version
Merge branch 'support-model-update' into develop

* support-model-update:
  Update service model to the latest version
Mark WebsiteRedirectLocation with no_paramfile

This will disable the special prefix processing for this
param.
Merge branch 's3-no-param' into develop

* s3-no-param:
  Mark WebsiteRedirectLocation with no_paramfile
Bump jmespath version to 0.2.0
Bumping version to 0.27.0
Merge branch 'release-0.27.0'

* release-0.27.0:
  Bumping version to 0.27.0
  Bump jmespath version to 0.2.0
  Mark WebsiteRedirectLocation with no_paramfile
  Update service model to the latest version
  Add a botocore-specific test for updated handling of maps in query interfaces.
  Fix handling of unflattened map parameters in query services.  Part of the fix for https://github.com/aws/aws-cli/issues/407.
  Fix handling of empty values for required list parameters.  Fixes https://github.com/aws/aws-cli/issues/524.
  Merge branch 'develop', remote-tracking branch 'origin' into develop