EUCA-7285  This fixes an issue with autoscaling not always being able to send cloudwatch metrics
Merge branch 'dev/ethomas/EUCA-7285' into maint/3.3/testing