Merge upstream openzeppelin-contracts into upstream-patched

contracts/package.json

@@ -5,8 +5,7 @@
   "files": [
     "**/*.sol",
     "/build/contracts/*.json",
-    "!/mocks",
-    "!/examples"
+    "!/mocks/**/*"
   ],
   "scripts": {
     "prepare": "bash ../scripts/prepare-contracts-package.sh",

package.json

@@ -6,9 +6,7 @@
   "files": [
     "/contracts/**/*.sol",
     "/build/contracts/*.json",
-    "!/contracts/mocks",
-    "!/contracts/proxy",
-    "/test/behaviors"
+    "!/contracts/mocks/**/*"
   ],
   "bin": {
     "openzeppelin-contracts-migrate-imports": "scripts/migrate-imports.js"