Merged r22391 and r22392 from trunk to 5.1-stable (#39400).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22393 e93f8b46-1217-0410-a6f0-8f06a7374b81

.stylelintrc

@@ -21,7 +21,6 @@
     "no-duplicate-at-import-rules": true,
     "no-duplicate-selectors": true,
     "no-empty-source": true,
-    "no-extra-semicolons": true,
     "no-invalid-double-slash-comments": true,
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {},
   "devDependencies": {
-    "stylelint": "^14.16.0"
+    "stylelint": "^15.11.0"
   }
 }