Merge branch 'candidate-8.2.x' into candidate-8.4.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

initfiles/bash/etc/systemd/system/thorslave@instance.service.in

@@ -3,7 +3,7 @@ Description=%i
 After=network.target remote-fs.target @dependencies@
 
 [Service]
-Type=simple
+Type=forking
 User=@RUNTIME_USER@
 Group=@RUNTIME_GROUP@
 PermissionsStartOnly=false