Merge pull request #12039 from mattwire/deprecated_paymentprocessortype