Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into B2B-2069

Author: NadiyaS

composer.lock

@@ -22,13 +22,11 @@ module.exports = function (grunt) {
             tasks = [
                 'continue:on',
                 'eslint:' + currentTarget,
-                'jscs:' + currentTarget,
                 'continue:off',
                 'continue:fail-on-warning'
             ];
 
         setConfig('eslint', currentTarget, cvf.getFiles(file));
-        setConfig('jscs', currentTarget, cvf.getFiles(file));
         grunt.task.run(tasks);
 
         if (!grunt.option('file')) {

dev/tools/grunt/configs/jscs.json

@@ -22,7 +22,6 @@
     "grunt-contrib-watch": "~1.1.0",
     "grunt-eslint": "~20.2.0",
     "grunt-exec": "~3.0.0",
-    "grunt-jscs": "~3.0.1",
     "grunt-replace": "~2.0.2",
     "grunt-styledocco": "~0.3.0",
     "grunt-template-jasmine-requirejs": "~0.2.3",