Fix mock set resolution for folder-based organization#39

sinedied with Copilot wants to merge 2 commits into

mainsinedied/smoke:mainfrom

copilot/fix-mock-sets-folder-structuresinedied/smoke:copilot/fix-mock-sets-folder-structureCopy head branch name to clipboard