jsHint fixes

issue #2294

- bad merge order = broken tests