Merge pull request #3080 from rubenk/rrdcached-cleanup