Support the switch from credis to hiredis

Conflicts:
	contrib/redhat/collectd.spec