Merge "Gruntfile.js: Remove obsolete eslint omissions"