Merge some patches from sysvinit-devel@ mailing lists