Remove old ganglia rrds during initialization
Merge branch 'master' into ec2-updates