Includes changes to tempest needed for instack installs

Change-Id: I9683614655cfcb26a795d015cdf6a5d4d5d829a2
Revert "Includes changes to tempest needed for instack installs"

This reverts commit a0631d7cd3ed1cfa6b54c38ca0beee5f316c43d3.
Breaks rdo-pkg

Change-Id: I135fac4d4f5fc7d1dca39f6e859f5979c0da5fad
Merge remote-tracking branch 'gerrit/master' into dev/reorg

Change-Id: Id5a5df17e977bd8491fe449fd7e275330c433a92