Fix the pagination config for ListObjectVersions to include both Versions and DeleteMarkers.  Fixes #377.
Retry ClosedPoolError from urllib3

This is a workaround for https://github.com/shazow/urllib3/pull/204
This is fixed in requests 2.0.0, but we'll have to evaluate whether
or not we want to upgrade.

In the meantime, the workaround for the above issue is to just retry
if we encouter that error.  By that time the poolmanager has the
connection pool primed, so a retry attempt will grab the connection
pool from the cache, bypassing the race condition.

This issue surfaces when trying to make multiple service calls
in parallel (for example `aws s3 cp`).
Merge branch 'retry-pool-closed-errors' into develop

* retry-pool-closed-errors:
  Retry ClosedPoolError from urllib3
Merge branch 'fix-issue-377' of git://github.com/garnaat/botocore into garnaat-fix-issue-377
Fix endpoint for support service so we don't get bit by http://bugs.python.org/issue13034 bug.  Fixes #139.
Change Name parameter of EC2 CopyImage operation from required to not required.  Fixes https://github.com/aws/aws-cli/issues/382.
Merge branch 'fix-issue-139' of git://github.com/garnaat/botocore into garnaat-fix-issue-139
Fix type in test class name
Protect auth signing with a lock

The parts that manipulate the .auth_path aren't thread safe.
While we can possibly make this more granular, the entire
`before-auth` and `add_auth` calls are protected with a lock.
All of the existing auth signing code is CPU bound, so this
won't negatively impact performance.
Merge branch 'lock-auth' into develop

* lock-auth:
  Protect auth signing with a lock
  Fix type in test class name
Rewind stream bodies on redirects

If the stream cannot be rewound an exception is raised.
Fixes #82.
Merge branch 'rewind-on-redirect' into develop

* rewind-on-redirect:
  Rewind stream bodies on redirects
Explicitly close file on test cleanup

Fixes windows test failures.
Use with statement instead of addCleanup

Fixes failing tests on windows.
Adding govcloud region to CloudFormation service.  See https://github.com/boto/botocore/pull/144.
Updating JSON models.
Revert to previous DirectConnect model that includes doc strings.
Merge branch 'release-0.18.0' into develop

* release-0.18.0:
  Bumping version to 0.18.0
Expose result_keys as a property

Allows clients to manually construct the results if they want
to do so.  Used by the CLI.
Update botocore to use dev branch of jmespath

This also required a change to the s3 page configs.  Based
on feedback, the 'or' token was replaced with '||'.