Merge "Fix tempest test failing with segments extension"