ubuntu/plucky: new_upstream_snapshot and manual refresh of retain-setuptools.patch

[blackboxsw]

To ease the process of reviewing your PR, do make sure to complete the following checklist before submitting a pull request.

• [x] I have signed the CLA: https://ubuntu.com/legal/contributors
• [x] I have included a comprehensive commit message using the guide below
• [x] I have added unit tests to cover the new behavior under tests/unittests/
  • Test files should map to source files i.e. a source file cloudinit/example.py should be tested by tests/unittests/test_example.py
  • Run unit tests with tox -e py3
• [ ] I have kept the change small, avoiding unnecessary whitespace or non-functional changes.
• [ ] I have added a reference to issues that this PR relates to in the PR message (Refs GH-1234, Fixes GH-1234)
• [ ] I have updated the documentation with the changed behavior.
  • If the change doesn't change the user interface and is trivial, this step may be skipped.
  • Cloud-config documentation is generated from the jsonschema.
  • Generate docs with tox -e doc.

Proposed Commit Message

pay special attention to manually created e96a554d for retain-setuptools.patch refresh

Manual steps performed:

# obtain most recent patched tools/test_tools.py
git checkout upstream/ubuntu/plucky
quilt push -a
cp tools/test_tools.py ..
quilt pop -a
gh co <PR_NUM>
new_upstream_snapshot.py
# note quilt patch error ..
quilt push -f
quilt add tools/test_tools.py
cp ../test_tools.py tools/
quilt refresh
quilt pop -a

Additional Context

Test Steps

quilt push -a
tox -e py3
tox -e doc
quilt pop -a

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>)
• [x] git push upstream from commandline