v15.5.22
add git merge driver for errors.json (#80722)
fix: fixed merge driver output, does not expect debugging messages to output on stdout (#80736)