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

PLFM-1975 Turn on CloudWatch metrics for the controllers
SWC-651 -- successfully created Jira issue
SWC-651
SWC-651
SWC-651
SWC-651
SWC-651; needed to add httpclient v. 4.2.5 to services-repository
SWC-651
SWC-651 Added check that restriction does not already exist
Merge branch 'release-1' into develop
Merge pull request #525 from brucehoff/SWC-651

SWC-651