Merge "[Tempest] Stop using deprecated Tempest opts"