[v0.18] pick llb metadata regression on version conflict fix#5564

tonistiigi merged 2 commits intomoby:v0.18moby/buildkit:v0.18from

tonistiigi:v0.18.1-pickstonistiigi/buildkit:v0.18.1-picksCopy head branch name to clipboard