Add test for bcdoc hidden arguments
Merge branch 'hidden-params' into develop

* hidden-params:
  Add test for bcdoc hidden arguments
Merge existing SNS topic policy with CloudTrail policy.

This prevents overwriting the default topic policy and makes the CLI behave
the same as the AWS Console.
Prevent printing None for prefix
Pull SNS topic merging into its own method; fix tests.
Reformat example policies
Merge branch 'cloudtrail-policy' into develop

When creating new SNS topics, merge the CloudTrail policy statements
with any existing policy statements.
Completer test should not depend on actual cfg file

If you enable a preview service in your real config file, you'll
get test failures.  Similar thing for plugins.

The fix is to point it at an empty cfg file so that we don't load
any real config files for unit tests.
Merge branch 'completer-test-preview' into develop

* completer-test-preview:
  Completer test should not depend on actual cfg file
Brings the CLI in line with pagination changes.
Updated to set data correctly.
A better fix for pagination.
Merge branch 'pagination-fix' into develop

Fixes #659.
Add note about configure being used to set preview services
Fix failing completer test
Update CHANGELOG with latest bug fixes
Adding support for all S3 canned ACLs (#663)

Adding all canned ACL names as documented in
http://docs.aws.amazon.com/AmazonS3/latest/dev/ACLOverview.html#CannedAC
L.
Merge branch 'asieira-develop' into develop

* asieira-develop:
  Adding support for all S3 canned ACLs (#663)
Update changelog entry for #663