Hotfix 2.12.0.4 to master

[maddieford]

Description

Hotfix 2.12.0.4 was never deployed to production.
Version 2.12.0.2 which was merged to master changed the syntax in the install_requires list. The syntax is only supported by setuptools v36.2+. Hotfix 2.12.0.4 has only a change to setup.py to revert this issue, and a few cherrypicked changes to the e2e tests images.

Since these changes are not included in the agent package which gets deployed to Prod, we will merge this branch to master directly with a PIR deployment.

Issue #

---

PR information

• Ensure development PR is based on the develop branch.
• The title of the PR is clear and informative.
• There are a small number of commits, each of which has an informative message. This means that previously merged commits do not appear in the history of the PR. For information on cleaning up the commits in your pull request, see this page.
• If applicable, the PR references the bug/issue that it fixes in the description.
• New Unit tests were added for the changes made

Quality of Code and Contribution Guidelines

• I have read the contribution guidelines.