Code cleanup - fix deprecation notice
Support for redhat
Merge remote-tracking branch 'cat/pam'