Merge branch 'master' into meson-no-libudev

diff --cc meson.build
index a7a316a74f6d45f306cb9cf2ef296a669a6e2cb7,0d61ce19ab5f526ac32d2d35464861c70f404d83..5a77785b8cf72a219d6bf9a9a8e2bd16bc9f2479
--- 1/meson.build
--- 2/meson.build
+++ b/meson.build
@@@ -2134,8 -2146,8 +2134,7 @@@ exe = executable('systemd-nspawn'
                   'src/core/loopback-setup.c',
                   'src/core/loopback-setup.h',
                   include_directories : [includes, include_directories('src/nspawn')],
-                  link_with : [libfirewall,
-                               libshared],
 -                 link_with : [libshared,
 -                              libudev],
++                 link_with : [libshared],
                   dependencies : [libacl,
                                   libblkid,
                                   libseccomp,

diff --cc src/test/meson.build
Simple merge