Merge "Fix comma errors in various js files (new jshint warning)"