Add proper state output to ec2_asg, ec2_metric_alarm, ec2_scaling_policy
Merge commit '7d28f30bdad43200bc9a98edcf472fe0891520cb' into current
uprev to fix broken merge