Update gemspec license to SPDX ID

http://guides.rubygems.org/specification-reference/#license=
http://spdx.org/licenses/
Revert invalid merge for AWS STS token