Revert back to commit 5a81b9f0e313436082ba9f3ca1d93659d1f37ceb

[dsabeti]

This commit reverts multiple commits, one which has introduced test flakiness:

• e0f3180
• 7ff7576
• d8bed37
• d2f17f6
• 99906b0

Thank you for submitting a pull request to the diego-release repository. We appreciate the contribution. To help us with getting better context for the pull request please follow these guidelines:

Please make sure to complete the following steps

• Before PR Submission, Submit an issue for either an Enhancement or Bug
• Check the Contributing document on how to sign the CLA and run tests in diego-release.
• Make sure a pull request is done against the develop branch.

Issue Link

Please link the issue you created above for a bug or enhancement.

Thank you!

[mariash]

We determined that the test flakiness was not caused by these changes, so going to close the PR