Revert pervious change and have PaymentPlugin < Killbill::Plugin::Payment (Kill Bill will check at runtime and fail if this is not the case)
Fix minor issue in type conversion