message: Report non-mandatory script failures correctly.
  Coming from btc@7ef8f3c072a8750c72a3a1cdc727b5c1d173bac8
diff: @@ -1898,9 +1898,9 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
  // arguments; if so, don't trigger DoS protection to
  // avoid splitting the network between upgraded and
  // non-upgraded nodes.
  - CScriptCheck check(*coins, tx, i,
  + CScriptCheck check2(*coins, tx, i,
  flags & ~STANDARD_NOT_MANDATORY_VERIFY_FLAGS, cacheStore, &cachedHashes);
  - if (check())
  + if (check2())
  return state.Invalid(false, REJECT_NONSTANDARD, strprintf("non-mandatory-script-verify-flag (%s)", ScriptErrorString(check.GetScriptError())));
  }
  // Failures of other flags indicate a transaction that is
  