Include X-Amz-Security-Token if available

Otherwise presigned urls won't work for temporary credentials.
Merge branch 'add-x-token' into develop

* add-x-token:
  Include X-Amz-Security-Token if available