Merge pull request #811 from mfournier/systemd-upstart-build-issue