Merge "Fix tempest upper-constraints"