Added optional placeholders for uri if placeholder is last
Merge branch 'master' of https://github.com/stat/aws-sdk-core-ruby