Use unquote_plus instead of unquote

Fixes aws/aws-cli#718

I'll also add an integ/unit test to the CLI repo to prevent
regressions in the future.
Merge branch 'unquote_plus' into develop

* unquote_plus:
  Use unquote_plus instead of unquote