Merge branch 'master' into features/cloudwatch-plugins
Merge branch 'features/cloudwatch-plugins' of github.com:mozilla-services/heka-build into features/cloudwatch-plugins