Fix signature v4 security token handling - EUCA-6492

Signature v4 was incorrectly looking for a security token using the old
SecurityToken parameter rather than the new X-Amz-Security-Token header
/ parameter.

EUCA-6492
Merge remote-tracking branch 'origin/dev/sjones/EUCA-6492' into maint/3.3/testing