- use pam_selinux to obtain the user context instead of doing it itself
- unbreak server keep alive settings (patch from upstream)
- small addition to scp manpage
- prevent initscript from killing itself on halt with upstart (#438449)
- initscript status should show that the daemon is running only when the
main daemon is still alive (#430882)