Make this work in SLES as well As RedHat.
Merge pull request #464 from apenney/fix-sles

Make this work in SLES as well As RedHat.
Merge branch 'master' into 2.2.x