Merge pull request #3159 from rpv-tomsk/collectd-usercache