Merlin downstreams for renaming voodoos

[liam923]

This is a duplicate of #152 that I made to get CI to run.

[voodoos]

Thanks for the fixes @liam923 the diff also looks ok to me.

[liam923]

@voodoos and I have collectively reviewed up to 740f5f5. The most recent 7 commits are changes I made while reviewing and should get a second set of eyes. Here's a commit-by-commit commentary on those 7 commits:

• 0eed693: Bring locate.ml slightly more in line with the upstream version, as well as a minor stylistic change. (The CR is addressed in a later commit.)
• 8235236: Some changes to get more in line with upstream.
• a14182c: Small change that is specific to oxcaml Merlin
• b59817c: Some stylistic changes and comment edits in oxcaml-specific Merlin code
• 977cfca: Make a test work with oxcaml. Tests in oxcaml Merlin are unable to use dune, so this commit changes a test to avoid using dune.
• 70801df: Changes to a test to bring it in line with upstream.
• d69ecf1: Resolve the aforementioned CR.

I've also verified that this version of Merlin has expected test output in our internal codebase.

[liam923]

I'm not sure why CI is failing - tests are succeeding for me locally. I'll look into it.

[liam923]

I'm not sure why CI is failing - tests are succeeding for me locally. I'll look into it.

Turns out a .merlin file that I added for a test was getting ignored by get, so it existed locally but not in the repo. The issue should now be resolved.

[dkalinichenko-js]

I reviewed the last 7 commits and am happy with them.