cleaned up style in mock responses that need to consider the port of the current MockWebServer
Merge pull request #1559 from jclouds/cleanup-terremark-mock

cleaned up style in mock responses that need to consider the port of the current MockWebServer
Merge pull request #1558 from whitlockjc/master

Complete CloudWatch API by adding Alarm APIs