WIP: MergeTree Folders#2

lmangani wants to merge 2 commits intomainQuery-farm/clickhouse-native:mainfrom

folderQuery-farm/clickhouse-native:folderCopy head branch name to clipboard