Fixing piwik.js tests and JSLint after realizing refs #4225
(cherry picked from commit 1dc0e11)
Merge remote-tracking branch 'origin/master'