CloudFormation fix simple workflow client shutdown handling - EUCA-10113
Merge remote-tracking branch 'origin/dev/sjones/EUCA-10113' into testing