Includes changes to tempest needed for instack installs

Change-Id: I9683614655cfcb26a795d015cdf6a5d4d5d829a2