handle JS_ENGINE being just a string
Merge remote-tracking branch 'upstream/master'
Need automated test fixes added by kripken.
Added little fix to test.py build.