Fix swapped Debian/RedHat params
Merge commit '0e692a7a7ee3f99e8086c5f47c194fbd944920b9'
Merge branch 'master' into stackhammer-reidmv-master