Issue #1094 rename cpustats to loadavg
Merge pull request #1136 from mozilla-services/issue_1094

Issue #1094 rename cpustats to loadavg
Merge branch 'dev' into issue_1024

Conflicts:
	CHANGES.txt