Make sure travis.sh script works when run-tests.js is not present.
Merge branch 'master' into uiunittests