Fix JSHint issues.
Merge pull request #4835 from rjackson/jshint-errors

Fix JSHint issues.