Import patches-applied version 2.2.21+really2.2.20-0ubuntu1~16.04.1 to applied/ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 6c9cd7e1ac55aae259d8e2f06569375e27a12f20
Unapplied parent: 7e7d885433a2bac56ce2361126bf7ec3d565fd66

New changelog entries:
  * Backport bionic version to xenial.
  * Revert to an older upstream release: 2.2.20 (LP: #1749589).
    - Rename upstream tarball to 2.2.21+really2.2.20 to end up with a
      temporarily higher version number than what's in the archive.
  * debian/patches/disable_import_test.patch: refreshed patch.

11 files changed, 20 insertions, 31 deletions

diff --git a/config/alpine/waagent.conf b/config/alpine/waagent.conf
index 883c81b..99495d5 100644
--- a/config/alpine/waagent.conf
+++ b/config/alpine/waagent.conf
@@ -14,8 +14,7 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
-# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
+# Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -89,5 +88,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/arch/waagent.conf b/config/arch/waagent.conf
index cf14e0a..200a458 100644
--- a/config/arch/waagent.conf
+++ b/config/arch/waagent.conf
@@ -14,8 +14,7 @@ Provisioning.DeleteRootPassword=n
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
-# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
+# Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -115,5 +114,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/bigip/waagent.conf b/config/bigip/waagent.conf
index 1e59a6a..9ff6ee1 100644
--- a/config/bigip/waagent.conf
+++ b/config/bigip/waagent.conf
@@ -25,8 +25,7 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
-# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
+# Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -93,5 +92,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/clearlinux/waagent.conf b/config/clearlinux/waagent.conf
index c63f92b..8109425 100644
--- a/config/clearlinux/waagent.conf
+++ b/config/clearlinux/waagent.conf
@@ -25,8 +25,7 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
-# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
+# Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -87,5 +86,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/coreos/waagent.conf b/config/coreos/waagent.conf
index ee4ebf2..cbb327f 100644
--- a/config/coreos/waagent.conf
+++ b/config/coreos/waagent.conf
@@ -14,8 +14,7 @@ Provisioning.DeleteRootPassword=n
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=n
 
-# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
-# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
+# Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=ed25519
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -115,5 +114,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/freebsd/waagent.conf b/config/freebsd/waagent.conf
index 74ad843..6406c75 100644
--- a/config/freebsd/waagent.conf
+++ b/config/freebsd/waagent.conf
@@ -14,8 +14,7 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
-# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
+# Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -113,5 +112,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/gaia/waagent.conf b/config/gaia/waagent.conf
index 0fd78a8..9c28ba3 100644
--- a/config/gaia/waagent.conf
+++ b/config/gaia/waagent.conf
@@ -14,8 +14,7 @@ Provisioning.DeleteRootPassword=n
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=n
 
-# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
-# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
+# Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -112,5 +111,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/openbsd/waagent.conf b/config/openbsd/waagent.conf
index 580b4a3..a39a9a5 100644
--- a/config/openbsd/waagent.conf
+++ b/config/openbsd/waagent.conf
@@ -15,7 +15,6 @@ 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.
@@ -111,5 +110,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf
index e83caf3..ba50be6 100644
--- a/config/suse/waagent.conf
+++ b/config/suse/waagent.conf
@@ -14,8 +14,7 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=y
 
-# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
-# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
+# Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -115,5 +114,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf
index 4fa2d12..71f2c04 100644
--- a/config/ubuntu/waagent.conf
+++ b/config/ubuntu/waagent.conf
@@ -14,8 +14,7 @@ Provisioning.DeleteRootPassword=y
 # Generate fresh host key pair.
 Provisioning.RegenerateSshHostKeyPair=n
 
-# Supported values are "rsa", "dsa", "ecdsa", "ed25519", and "auto".
-# The "auto" option is supported on OpenSSH 5.9 (2011) and later.
+# Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
@@ -103,5 +102,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y
diff --git a/config/waagent.conf b/config/waagent.conf
index 5772645..589ca99 100644
--- a/config/waagent.conf
+++ b/config/waagent.conf
@@ -15,7 +15,6 @@ 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.
@@ -115,5 +114,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 existing VMs
+# - The default is false to protect the state of exising VMs
 OS.EnableFirewall=y