Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

mig/install/MiGserver-template.conf

@@ -428,6 +428,8 @@ __JUPYTER_SECTIONS__
 # Semi-colon separated list of user=jumpaddr pairs to override for some users
 # service_jumphost_address_map =
 # service_jumphost_user = mist
+# Path to the ssh key used for managing user public keys on cloud jumphost
+# service_jumphost_key = ~/.ssh/cloud-jumphost-key
 # Semi-colon separated list of user=jumpuser pairs to override for some users
 # service_jumphost_user_map =
 # Helper to automatically add user pub keys on jumphost

tests/fixture/confs-stdlocal/MiGserver.conf

@@ -428,6 +428,8 @@ lrmstypes = Native Native-execution-leader Batch Batch-execution-leader
 # Semi-colon separated list of user=jumpaddr pairs to override for some users
 # service_jumphost_address_map =
 # service_jumphost_user = mist
+# Path to the ssh key used for managing user public keys on cloud jumphost
+# service_jumphost_key = ~/.ssh/cloud-jumphost-key
 # Semi-colon separated list of user=jumpuser pairs to override for some users
 # service_jumphost_user_map =
 # Helper to automatically add user pub keys on jumphost