merged fixes for redhat and redis