Fix missing brackets around an if statement
Fix app build for Cordova

Caught by a zillion tests, oops.  But not by --prepare-app!
"Fix" bizarre memory corruption (?) bug

See #3285.  For some reason, in some mostly-replicatable circumstances,
this is necessary.  Clearly some sort of V8/Node/Fibers bug.
Console.debug instead of .warn about falling back to fs.watchFile.
Avoid pathwatcher.watch failures in testDirectory.
Make pathwatcher calls go through files.js

Conflicts:
	tools/files.js
	tools/safe-pathwatcher.js
Merge branch 'devel' into windows-r

Conflicts:
	tools/files.js
	tools/package-map.js
	tools/safe-pathwatcher.js