add missing quotes, fixes #17199
Fixes relative paths when using dojo/node, fixes #16414
Merge remote-tracking branch 'upstream/master'