Merge LSP branch with upstream

fixes #1375 (closed)

Another merge of the lsp tooling branch into the dev branch.

Changes outside tools/lsp include only the syntax highlighting tool.

• has a changelog entry