740aad6712
No other changes will be needed when merging the json5 branch into Base-7.0, these changes let testpvalink pass with and without it.