Revert "Includes changes to tempest needed for instack installs"

This reverts commit a0631d7cd3ed1cfa6b54c38ca0beee5f316c43d3.
Breaks rdo-pkg

Change-Id: I135fac4d4f5fc7d1dca39f6e859f5979c0da5fad