Adds changes to support using tempest rpm for instack installs.

Change-Id: I7f2898615e407c36d5b6c045e1b32718b252353e
Merge remote-tracking branch 'origin/dev/rlandy/instack-settings' into instack-settings