Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix error when building archipel-agent rpm due to systemd folder not being in manifest
fix error code at the wrong place
Merge pull request #799 from nicolasochem/fix_rpm_build

Fix rpm build