PaymentPluginApi rework (payment methods)
Merge branch 'new-paymentpluginapi' of github.com:killbill/killbill into new-paymentpluginapi