Sync up with the goamz fixes and API changes for cloudwatch