Merge pull request #521 from eric-wu/release-1

PLFM-1975 Turn on CloudWatch metrics for the controllers
Merge branch 'release-1' into develop