Merge branch 'master' into feature/dev-tools

CONTRIBUTING.md

@@ -171,8 +171,8 @@ Execute the front-end browser tests. This requires the server started by the `te
 Packages are built using fpm, pleaserun, dpkg, and rpm.  fpm and pleaserun can be installed using gem.  Package building has only been tested on Linux and is not supported on any other platform.
 ```sh
 apt-get install ruby-dev rpm
-gem install fpm -v 1.5.0 # required by pleaserun 0.0.16
-gem install pleaserun -v 0.0.16 # higher versions fail at the moment
+gem install fpm -v 1.5.0
+gem install pleaserun -v 0.0.24
 npm run build -- --skip-archives
 ```
 

tasks/build/os_packages.js

@@ -62,7 +62,7 @@ export default (grunt) => {
         `${buildDir}/config/=${packages.path.conf}/`,
         `${buildDir}/data/=${packages.path.data}/`,
         `${servicesByName.sysv.outputDir}/etc/=/etc/`,
-        `${servicesByName.systemd.outputDir}/lib/=/lib/`
+        `${servicesByName.systemd.outputDir}/etc/=/etc/`
       ];
 
       //Manually find flags, multiple args without assignment are not entirely parsed