Merge commit 'v24'

Conflicts:
	units/remote-fs.target.m4

diff --cc units/remote-fs.target.m4
index fc1fd2bec42d73770ac57d3637623ceca9f5af1d,53054b6ec43bd4a7eecd9b855fe70b44b0fa2542..c11ffbffa8bd1ade1548fe0cc4ed826704253e5b
--- 1/units/remote-fs.target.m4
--- 2/units/remote-fs.target.m4
+++ b/units/remote-fs.target.m4
@@@ -12,8 -12,7 +12,7 @@@ Description=Remote File System
  m4_dnl
  m4_ifdef(`FOR_SYSTEM',
  m4_dnl When running in system mode we need the network up
- Requires=network.target
 -After=network.target
 +After=network.target local-fs.target
  )m4_dnl
  
  [Install]