Fix script tests for P2SH
Fix script tests for P2SH

Upstream: 922e8e2929a2e78270868385aa46f96002fbcff3

TheoremCrypto/TheoremCoin,gorgoy/novacoin,daeMOn63/Peershares,redfish64/nomiccoin,novacoin-project/novacoin,glv2/peerunity,novacoin-project/novacoin,shadowproject/shadow,Magicking/neucoin,palm12341/jnc,neureal/noocoin,jlay11/sharecoin,byncoin-project/byncoin,vizidrixfork/Peershares,bitgrowchain/bitgrow,elambert2014/cbx2,ForceMajeure/BitPenny-Client,nochowderforyou/clams,senadj/yacoin,BeirdoMud/MudCoin,ghostlander/Testcoin,vectorcoindev/Vector,FuzzyBearBTC/Peerunity,5mil/SuperTurboStake,CoinGame/BCEShadowNet,FuzzyBearBTC/Peershares2,AquariusNetwork/ARCOv2,Whitecoin-org/Whitecoin,vectorcoindev/Vector,dooglus/clams,lordsajan/erupee,yacoin/yacoin,byncoin-project/byncoin,VsyncCrypto/Vsync,Kefkius/clams,jyap808/jumbucks,valorbit/valorbit,TheSeven/ppcoin,valorbit/valorbit-oss,yacoin/yacoin,stamhe/novacoin,jyap808/jumbucks,BlueMeanie/PeerShares,sproutcoin/sprouts,okcashpro/okcash,slimcoin-project/Slimcoin,som4paul/BolieC,TheoremCrypto/TheoremCoin,CoinGame/NuShadowNet,sigmike/peercoin,byncoin-project/byncoin,Jheguy2/Mercury,IOCoin/iocoin,Someguy123/novafoil,CoinGame/NuShadowNet,AquariusNetwork/ARCOv2,Whitecoin-org/Whitecoin,elcrypto/Pulse,snakie/ppcoin,FuzzyBearBTC/peercoin,sigmike/peercoin,iadix/iadixcoin,MOIN/moin,sproutcoin/sprouts,fsb4000/novacoin,pocopoco/yacoin,iceinsidefire/peershare-edit,elambert2014/cbx2,IOCoin/DIONS,peercoin/peercoin,LanaCoin/lanacoin,landcoin-ldc/landcoin,iadix/iadixcoin,MoMoneyMonetarism/ppcoin,sigmike/peercoin,effectsToCause/vericoin,AquariusNetwork/ARCO,snakie/ppcoin,okcashpro/okcash,FuzzyBearBTC/Fuzzyshares,BeirdoMud/MudCoin,Peershares/Peershares,stamhe/novacoin,ALEXIUMCOIN/alexium,5mil/Bolt,Rimbit/Wallets,etercoin/etercoin,Rimbit/Wallets,FuzzyBearBTC/Peershares-1,CoinGame/BCEShadow,DigitalPandacoin/pandacoin,lentza/SuperTurboStake,gorgoy/novacoin,shadowproject/shadow,pocopoco/yacoin,TheoremCrypto/TheoremCoin,landcoin-ldc/landcoin,valorbit/valorbit-oss,CoinGame/BCEShadowNet,Peerapps/ppcoin,gades/novacoin,CoinBlack/blackcoin,Crypto-Currency/BitBar,robvanmieghem/clams,5mil/Bolt,gades/novacoin,AquariusNetwork/ARCO,byncoin-project/byncoin,Peershares/Peershares,Peerunity/Peerunity,FuzzyBearBTC/Peershares-1,greencoin-dev/GreenCoinV2,Magicking/neucoin,LanaCoin/lanacoin,Stakemaker/OMFGcoin,thodg/ppcoin,MoMoneyMonetarism/ppcoin,NeuCoin/neucoin,senadj/yacoin,xranby/blackcoin,Kefkius/clams,FuzzyBearBTC/Peershares2,senadj/yacoin,glv2/peerunity,IOCoin/DIONS,glv2/peerunity,pinkmagicdev/SwagBucks,som4paul/BolieC,Action-Committee/Spaceballz,BeirdoMud/MudCoin,neureal/noocoin,lordsajan/erupee,redfish64/nomiccoin,xranby/blackcoin,valorbit/valorbit,stamhe/novacoin,SproutsEx/SproutsExtreme,ghostlander/Orbitcoin,sigmike/peercoin,etercoin/etercoin,thunderrabbit/clams,SproutsEx/SproutsExtreme,Peerapps/ppcoin,bitgrowchain/bitgrow,SproutsEx/SproutsExtreme,TurboStake/TurboStake,FuzzyBearBTC/Peershares-1,shadowproject/shadow,dooglus/clams,palm12341/jnc,pinkmagicdev/SwagBucks,greencoin-dev/GreenCoinV2,jlay11/sharecoin,fsb4000/novacoin,IOCoin/DIONS,prodigal-son/blackcoin,Peershares/Peershares,MOIN/moin,peerdb/cors,FuzzyBearBTC/peercoin,IOCoin/iocoin,FuzzyBearBTC/Fuzzyshares,thodg/ppcoin,ForceMajeure/BitPenny-Client,Jheguy2/Mercury,Ziftr/ppcoin,gfneto/Peershares,AquariusNetwork/ARCOv2,VsyncCrypto/Vsync,IOCoin/DIONS,IOCoin/DIONS,stamhe/ppcoin,lordsajan/erupee,gades/novacoin,slimcoin-project/Slimcoin,elambert2014/novacoin,VsyncCrypto/Vsync,gorgoy/novacoin,Stakemaker/OMFGcoin,iadix/iadixcoin,thunderrabbit/clams,elambert2014/cbx2,Action-Committee/Spaceballz,Stakemaker/OMFGcoin,lateminer/DopeCoinGold,benzhi888/renminbi,BlueMeanie/PeerShares,TheoremCrypto/TheoremCoin,TurboStake/TurboStake,ALEXIUMCOIN/alexium,stamhe/novacoin,prodigal-son/blackcoin,lordsajan/erupee,FuzzyBearBTC/Fuzzyshares,bitgrowchain/bitgrow,DigitalPandacoin/pandacoin,Peerunity/Peerunity,gorgoy/novacoin,pinkmagicdev/SwagBucks,elcrypto/Pulse,peercoin/peercoin,byncoin-project/byncoin,okcashpro/okcash,penek/novacoin,MOIN/moin,stamhe/novacoin,Ziftr/Peerunity,5mil/Bolt,iceinsidefire/peershare-edit,ghostlander/Orbitcoin,Magicking/neucoin,robvanmieghem/clams,gorgoy/novacoin,palm12341/jnc,FuzzyBearBTC/Peershares2,daeMOn63/Peershares,phorensic/yacoin,Someguy123/novafoil,GeopaymeEE/e-goldcoin,FuzzyBearBTC/Peershares,MOIN/moin,slimcoin-project/Slimcoin,NeuCoin/neucoin,rat4/blackcoin,greencoin-dev/GreenCoinV2,Whitecoin-org/Whitecoin,prodigal-son/blackcoin,CoinBlack/bitcoin,Magicking/neucoin,benzhi888/renminbi,phorensic/yacoin,lentza/SuperTurboStake,snakie/ppcoin,valorbit/valorbit,phorensic/yacoin,elambert2014/cbx2,vectorcoindev/Vector,vectorcoindev/Vector,peerdb/cors,CoinBlack/blackcoin,lateminer/DopeCoinGold,ALEXIUMCOIN/alexium,5mil/SuperTurboStake,Whitecoin-org/Whitecoin,thunderrabbit/clams,redfish64/nomiccoin,TurboStake/TurboStake,ghostlander/Orbitcoin,CoinBlack/bitcoin,slimcoin-project/Slimcoin,redfish64/nomiccoin,etercoin/etercoin,elambert2014/novacoin,ya4-old-c-coder/yacoin,CoinGame/BCEShadow,valorbit/valorbit,lentza/SuperTurboStake,NeuCoin/neucoin,MoMoneyMonetarism/ppcoin,yacoin/yacoin,peerdb/cors,5mil/SuperTurboStake,MoMoneyMonetarism/ppcoin,lordsajan/erupee,CoinBlack/bitcoin,MoMoneyMonetarism/ppcoin,peerdb/cors,ALEXIUMCOIN/alexium,Kefkius/clams,AquariusNetwork/ARCO,FuzzyBearBTC/Peershares,okcashpro/okcash,fsb4000/novacoin,fsb4000/novacoin,AquariusNetwork/ARCOv2,AquariusNetwork/ARCO,prodigal-son/blackcoin,peercoin/peercoin,rat4/blackcoin,FuzzyBearBTC/Peershares,ALEXIUMCOIN/alexium,elambert2014/novacoin,CoinGame/BCEShadowNet,xranby/blackcoin,IOCoin/iocoin,iadix/iadixcoin,Ziftr/Peerunity,BlueMeanie/PeerShares,d5000/ppcoin,Rimbit/Wallets,CoinGame/NuShadowNet,thunderrabbit/clams,AquariusNetwork/ARCO,TheSeven/ppcoin,elambert2014/cbx2,byncoin-project/byncoin,benzhi888/renminbi,Jheguy2/Mercury,snakie/ppcoin,CoinGame/BCEShadowNet,gades/novacoin,okcashpro/okcash,CoinGame/BCEShadow,5mil/Bolt,Stakemaker/OMFGcoin,CoinBlack/bitcoin,Someguy123/novafoil,sproutcoin/sprouts,TurboStake/TurboStake,dopecoin-dev/DopeCoinGold,yacoin/yacoin,redfish64/nomiccoin,vectorcoindev/Vector,benzhi888/renminbi,greencoin-dev/GreenCoinV2,gfneto/Peershares,jashandeep-sohi/ppcoin,blackcoinhelp/blackcoin,pocopoco/yacoin,Peershares/Peershares,pinkmagicdev/SwagBucks,DigitalPandacoin/pandacoin,Ziftr/ppcoin,FuzzyBearBTC/Peerunity,IOCoin/DIONS,som4paul/BolieC,TheSeven/ppcoin,penek/novacoin,novacoin-project/novacoin,daeMOn63/Peershares,CoinBlack/blackcoin,jlay11/sharecoin,FuzzyBearBTC/Peershares-1,etercoin/etercoin,Ziftr/ppcoin,fsb4000/novacoin,internaut-me/ppcoin,valorbit/valorbit-oss,lordsajan/erupee,rat4/blackcoin,robvanmieghem/clams,vizidrixfork/Peershares,FuzzyBearBTC/Peershares,elcrypto/Pulse,effectsToCause/vericoin,GeopaymeEE/e-goldcoin,Peerunity/Peerunity,ghostlander/Testcoin,dopecoin-dev/DopeCoinGold,Action-Committee/Spaceballz,lordsajan/erupee,Rimbit/Wallets,ppcoin/ppcoin,5mil/SuperTurboStake,blackcoinhelp/blackcoin,LanaCoin/lanacoin,FuzzyBearBTC/Peershares-1,internaut-me/ppcoin,robvanmieghem/clams,phorensic/yacoin,peerdb/cors,BlueMeanie/PeerShares,thodg/ppcoin,som4paul/BolieC,lordsajan/erupee,iadix/iadixcoin,jyap808/jumbucks,vizidrixfork/Peershares,DigitalPandacoin/pandacoin,TheSeven/ppcoin,sigmike/peercoin,TheoremCrypto/TheoremCoin,greencoin-dev/GreenCoinV2,phorensic/yacoin,peerdb/cors,CoinGame/BCEShadowNet,Action-Committee/Spaceballz,peercoin/peercoin,xranby/blackcoin,stronghands/stronghands,senadj/yacoin,GeopaymeEE/e-goldcoin,dooglus/clams,gades/novacoin,ppcoin/ppcoin,valorbit/valorbit-oss,elcrypto/Pulse,yacoin/yacoin,iadix/iadixcoin,SproutsEx/SproutsExtreme,slimcoin-project/Slimcoin,dopecoin-dev/DopeCoinGold,novacoin-project/novacoin,novacoin-project/novacoin,pocopoco/yacoin,lateminer/DopeCoinGold,blackcoinhelp/blackcoin,lentza/SuperTurboStake,jlay11/sharecoin,stamhe/ppcoin,stronghands/stronghands,CoinBlack/bitcoin,AquariusNetwork/ARCOv2,shadowproject/shadow,blackcoinhelp/blackcoin,ghostlander/Testcoin,d5000/ppcoin,elambert2014/novacoin,penek/novacoin,CoinGame/BCEShadow,ghostlander/Orbitcoin,Kefkius/clams,BeirdoMud/MudCoin,coinkeeper/2015-06-22_18-45_peercoin,Jheguy2/Mercury,iadix/iadixcoin,robvanmieghem/clams,stronghands/stronghands,internaut-me/ppcoin,CoinGame/NuShadowNet,elambert2014/novacoin,thodg/ppcoin,Ziftr/ppcoin,landcoin-ldc/landcoin,rat4/blackcoin,lateminer/DopeCoinGold,stamhe/ppcoin,dooglus/clams,thodg/ppcoin,penek/novacoin,thunderrabbit/clams,FuzzyBearBTC/Peerunity,DigitalPandacoin/pandacoin,peercoin/peercoin,ppcoin/ppcoin,VsyncCrypto/Vsync,ya4-old-c-coder/yacoin,daeMOn63/Peershares,elambert2014/novacoin,FuzzyBearBTC/Peershares,neureal/noocoin,coinkeeper/2015-06-22_18-45_peercoin,Peerapps/ppcoin,ya4-old-c-coder/yacoin,prodigal-son/blackcoin,ya4-old-c-coder/yacoin,coinkeeper/2015-06-22_18-45_peercoin,pocopoco/yacoin,iceinsidefire/peershare-edit,landcoin-ldc/landcoin,Whitecoin-org/Whitecoin,MOIN/moin,ppcoin/ppcoin,DigitalPandacoin/pandacoin,d5000/ppcoin,Peerunity/Peerunity,som4paul/BolieC,nochowderforyou/clams,Ziftr/Peerunity,ghostlander/Testcoin,okcashpro/okcash,landcoin-ldc/landcoin,sproutcoin/sprouts,FuzzyBearBTC/peercoin,dopecoin-dev/DopeCoinGold,FuzzyBearBTC/Peershares2,dopecoin-dev/DopeCoinGold,VsyncCrypto/Vsync,LanaCoin/lanacoin,ForceMajeure/BitPenny-Client,vizidrixfork/Peershares,bitgrowchain/bitgrow,jashandeep-sohi/ppcoin,internaut-me/ppcoin,NeuCoin/neucoin,CoinBlack/bitcoin,jyap808/jumbucks,BlueMeanie/PeerShares,penek/novacoin,effectsToCause/vericoin,fsb4000/novacoin,jlay11/sharecoin,benzhi888/renminbi,ghostlander/Orbitcoin,slimcoin-project/Slimcoin,jashandeep-sohi/ppcoin,valorbit/valorbit-oss,GeopaymeEE/e-goldcoin,Crypto-Currency/BitBar,novacoin-project/novacoin,CoinBlack/blackcoin,penek/novacoin,FuzzyBearBTC/Fuzzyshares,FuzzyBearBTC/Peershares2,glv2/peerunity,d5000/ppcoin,stronghands/stronghands,nochowderforyou/clams,redfish64/nomiccoin,gades/novacoin,IOCoin/DIONS,blackcoinhelp/blackcoin,lentza/SuperTurboStake,palm12341/jnc,GeopaymeEE/e-goldcoin,neureal/noocoin,FuzzyBearBTC/Peerunity,Crypto-Currency/BitBar,ya4-old-c-coder/yacoin,IOCoin/iocoin,LanaCoin/lanacoin,Rimbit/Wallets,effectsToCause/vericoin,Someguy123/novafoil,FuzzyBearBTC/peercoin,CoinGame/NuShadowNet,CoinBlack/blackcoin,jyap808/jumbucks,Jheguy2/Mercury,iadix/iadixcoin,effectsToCause/vericoin,senadj/yacoin,dooglus/clams,Ziftr/Peerunity,iceinsidefire/peershare-edit,CoinGame/BCEShadow,Ziftr/ppcoin,IOCoin/DIONS,iadix/iadixcoin,iadix/iadixcoin,lateminer/DopeCoinGold,nochowderforyou/clams,etercoin/etercoin,MOIN/moin,shadowproject/shadow,Kefkius/clams,palm12341/jnc,TheSeven/ppcoin,gfneto/Peershares,valorbit/valorbit,Crypto-Currency/BitBar,nochowderforyou/clams,Peerapps/ppcoin,ForceMajeure/BitPenny-Client,iadix/iadixcoin,pinkmagicdev/SwagBucks,stamhe/ppcoin,coinkeeper/2015-06-22_18-45_peercoin,peercoin/peercoin,jashandeep-sohi/ppcoin,IOCoin/iocoin,daeMOn63/Peershares,gfneto/Peershares,shadowproject/shadow,jlay11/sharecoin,rat4/blackcoin