BZ-9999 fixed to pass jshint
Merge remote-tracking branch 'refs/remotes/origin/master'