Merge "Updated logging for CloudWatch plugin"