Fixes for previous update
Update changelog with latest changes
Merge branch 'EronHennessey-doc-example-updates' into develop

NOTE: I've excluded the put-object.rst again as it is
incorrect.  For more info see:

https://github.com/aws/aws-cli/pull/799#issuecomment-44754933