Merge "Fix T104 for scenario test subdirs"