Fixed the json formatting when using JSONC
Update SPDX licenses, fixes #3431
Restrict the JSONC fix to affected versions
Fix typo
Merge pull request #3432 from stof/patch-1

Fixed the json formatting when using JSONC