Merge "Relocate branch conditional for tempest-full job"