support for centos 7 and sles
fixed merge conflcits