add support for rhel/centos
Merge upstream changes