Import patches-applied version 2.2.21-0ubuntu1 to applied/ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 110d301b04a64d680fc7d102424e303a8e3ca1a6
Unapplied parent: d5298bbf0f5696fc948877304e86f43d477d6b71

New changelog entries:
  * New upstream release (LP: #1746628).
  * debian/patches/disable_import_test.patch: refreshed patch.

11 files changed, 34 insertions, 20 deletions

diff --git a/config/alpine/waagent.conf b/config/alpine/waagent.conf
index 99495d5..883c81b 100644
--- a/config/alpine/waagent.conf
+++ b/config/alpine/waagent.conf
@@ -14,7 +14,8 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa" and "ecdsa".
+# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -88,5 +89,5 @@ OS.SshDir=/etc/ssh
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/arch/waagent.conf b/config/arch/waagent.conf
index 200a458..cf14e0a 100644
--- a/config/arch/waagent.conf
+++ b/config/arch/waagent.conf
@@ -14,7 +14,8 @@ Provisioning.DeleteRootPassword=n
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa" and "ecdsa".
+# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -114,5 +115,5 @@ OS.SshDir=/etc/ssh
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/bigip/waagent.conf b/config/bigip/waagent.conf
index 9ff6ee1..1e59a6a 100644
--- a/config/bigip/waagent.conf
+++ b/config/bigip/waagent.conf
@@ -25,7 +25,8 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa" and "ecdsa".
+# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -92,5 +93,5 @@ AutoUpdate.Enabled=y
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/clearlinux/waagent.conf b/config/clearlinux/waagent.conf
index 8109425..c63f92b 100644
--- a/config/clearlinux/waagent.conf
+++ b/config/clearlinux/waagent.conf
@@ -25,7 +25,8 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa" and "ecdsa".
+# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -86,5 +87,5 @@ AutoUpdate.GAFamily=Prod
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/coreos/waagent.conf b/config/coreos/waagent.conf
index cbb327f..ee4ebf2 100644
--- a/config/coreos/waagent.conf
+++ b/config/coreos/waagent.conf
@@ -14,7 +14,8 @@ Provisioning.DeleteRootPassword=n
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=n
 
-# Supported values are "rsa", "dsa" and "ecdsa".
+# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=ed25519
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -114,5 +115,5 @@ OS.AllowHTTP=y
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/freebsd/waagent.conf b/config/freebsd/waagent.conf
index 6406c75..74ad843 100644
--- a/config/freebsd/waagent.conf
+++ b/config/freebsd/waagent.conf
@@ -14,7 +14,8 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa" and "ecdsa".
+# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -112,5 +113,5 @@ OS.SudoersDir=/usr/local/etc/sudoers.d
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/gaia/waagent.conf b/config/gaia/waagent.conf
index 9c28ba3..0fd78a8 100644
--- a/config/gaia/waagent.conf
+++ b/config/gaia/waagent.conf
@@ -14,7 +14,8 @@ Provisioning.DeleteRootPassword=n
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=n
 
-# Supported values are "rsa", "dsa" and "ecdsa".
+# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -111,5 +112,5 @@ AutoUpdate.Enabled=n
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/openbsd/waagent.conf b/config/openbsd/waagent.conf
index a39a9a5..580b4a3 100644
--- a/config/openbsd/waagent.conf
+++ b/config/openbsd/waagent.conf
@@ -15,6 +15,7 @@ Provisioning.DeleteRootPassword=y
 Provisioning.RegenerateSshHostKeyPair=y
 
 # Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=auto
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -110,5 +111,5 @@ OS.PasswordPath=/etc/master.passwd
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf
index ba50be6..e83caf3 100644
--- a/config/suse/waagent.conf
+++ b/config/suse/waagent.conf
@@ -14,7 +14,8 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa" and "ecdsa".
+# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -114,5 +115,5 @@ OS.SshDir=/etc/ssh
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf
index 71f2c04..4fa2d12 100644
--- a/config/ubuntu/waagent.conf
+++ b/config/ubuntu/waagent.conf
@@ -14,7 +14,8 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=n
 
-# Supported values are "rsa", "dsa" and "ecdsa".
+# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -102,5 +103,5 @@ OS.SshDir=/etc/ssh
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y
diff --git a/config/waagent.conf b/config/waagent.conf
index f465e8f..5772645 100644
--- a/config/waagent.conf
+++ b/config/waagent.conf
@@ -15,6 +15,7 @@ Provisioning.DeleteRootPassword=n
 Provisioning.RegenerateSshHostKeyPair=n
 
 # Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
+# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -66,6 +67,9 @@ OS.RootDeviceScsiTimeout=300
 # If "None", the system default version is used.
 OS.OpensslPath=None
 
+# Set the SSH ClientAliveInterval
+# OS.SshClientAliveInterval=180
+
 # Set the path to SSH keys and configuration files
 OS.SshDir=/etc/ssh
 
@@ -111,5 +115,5 @@ OS.SshDir=/etc/ssh
 
 # Add firewall rules to protect access to Azure host node services
 # Note:
-# - The default is false to protect the state of exising VMs
+# - The default is false to protect the state of existing VMs
 OS.EnableFirewall=y