FORGE-1689 Fix ambiguous dependency resolution for ScaffoldProvider
FORGE-1690 Fix provider selection issue in scaffold generate command