fix p2sh with non-standard OP_CHECKSIG from testnet3

  yikes, i fixed OP_CHECKMULTISIG but got OP_CHECKSIG wrong on the inner script refactor .. sorry.
Merge remote-tracking branch 'upstream/master'