Merge "Update tempest stable branch testing"