Fix sysvinit upstart detection and give it a pretty message
Merge pull request #2651 from tianon/fix-sysvinit-upstart-logic

Fix sysvinit upstart detection and give it a pretty message