Merge upstream openzeppelin-contracts into upstream-patched

contracts/mocks/BadBeacon.sol

@@ -2,13 +2,11 @@
 
 pragma solidity >=0.6.0 <0.8.0;
 
-import "../proxy/IBeacon.sol";
-
 contract BadBeaconNoImpl {
 }
 
-contract BadBeaconNotContract is IBeacon {
-    function implementation() external view override returns (address) {
+contract BadBeaconNotContract {
+    function implementation() external view returns (address) {
         return address(0x1);
     }
 }

test/token/ERC1155/ERC1155Pausable.test.js

@@ -80,7 +80,7 @@ contract('ERC1155Pausable', function (accounts) {
 
     it('reverts when trying to burnBatch', async function () {
       await expectRevert(
-        this.token.burn(holder, [firstTokenId], [firstTokenAmount]),
+        this.token.burnBatch(holder, [firstTokenId], [firstTokenAmount]),
         'ERC1155Pausable: token transfer while paused',
       );
     });