ganglia: diskstat update from upstream

Rewrites the hack I made previously (830084a) to something that has
been, proposed and merged by upstream. DEVICES is now None instead of
being an empty string.

Change-Id: Ib613de90f441bee53c853eff4d491bddcb2d8bde
Merge "ganglia: diskstat update from upstream" into production