Merge pull request #656 from eric-wu/quickfix

Add stack ID to CloudWatch metric name