CloudFormation not tech preview - EUCA-9848
Merge remote-tracking branch 'origin/dev/sjones/EUCA-9848' into testing