Merge pull request #8559 from poettering/integration-test-fixes
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 23 Mar 2018 18:21:25 +0000 (19:21 +0100)
committerGitHub <noreply@github.com>
Fri, 23 Mar 2018 18:21:25 +0000 (19:21 +0100)
make integration tests pass again


Trivial merge