[blackboxsw]

upstream/ubuntu/bionic branch carried a proposed patch to deprecate ubuntu_advantage: key in favor of ubuntu_pro. But, the review of that SRU pointed out risks and support corner cases that we were not willing to justify for the introduced changeset.

In preparation for a bugfix SRU to bionic, remove the unreleased content from upstream/ubuntu/bionic branch and sync the already published content from ESM infra PPA.

This PR is two commits:

1. revert unreleased content related to the deprecation of ubuntu_advantage cloud-config key and renamed module.
2. sync ESM released CVE fixes from 23.1.2-0ubuntu0~18.04.1+esm1 into our ubuntu/bionic branch,

Proposed Commit Message

* chore: sync ESM released content and patches for 23.1.2-0ubuntu0~18.04.1+esm1

* chore: revert unreleased commits. rejected ubuntu_advantage deprecation effort

Additional Context

This cleanup is prompted by ongoing Bionic ESM support fix #6924. For which we will perform a cherry pick for ESM-based cloud-images.

Test Steps

quilt push -a
quilt pop -a
sbuild --dist=bionic --arch=amd64  --arch-all  ../out/cloud-init_*.dsc

Merge type

• [ ] Squash merge using "Proposed Commit Message"
• Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)
• git push from the commandline once approved.

[blackboxsw]

CI disallowed on this branch because bionic doesn't have SHA commit based workflows (which is our upstream convention nowadays). I don't feel like we should relax the upstream project requirements so that this CI can run, but I also don't want this PR to add the unrelated workflow changes as this content is already officially released and has correctly passed lintian and package build operations. If we want a separate PR to update workflows in ubuntu/bionic so CI continues to run here I can take that to a separate PR.

[blackboxsw]

Successful bionic sbuild of this PR performed which exercises all quilt patches, unittests and no new lintian warnings or errors.