src,test: fix merge issues

[kfarnung]

• Added #include <vector> to fix a build break on Linux
• Fixed test lint issues (line and indents mostly)
• Fixed options lint issues and added the help text back

Checklist

• [x] make -j4 test (UNIX), or vcbuild test (Windows) passes
• [x] tests and/or benchmarks are included
• [x] documentation is changed or added
• [x] commit message follows commit guidelines

[kfarnung]

CI: https://ci.nodejs.org/job/chakracore-test-pull-request/309/

[kfarnung]

The CI fails due to another fix I'm trying to land upstream: https://github.com/nodejs/node/pull/22721

Once that lands I'll cherry-pick it here. I've already tested locally and Linux build/test run passes with both changes.