Fixed some minor bugs detected by FindBugs while building on Jenkins.
Merge branch 'master' of https://github.com/omnifone/metrics-cloudwatch