Fix imaging workflow security token check - EUCA-9969
Merge remote-tracking branch 'origin/dev/sjones/EUCA-9969' into testing