Uniformization of test setup
Fix broken beatrix test-- that was flaky for a good reason.
Merge branch 'new-paymentpluginapi' of github.com:killbill/killbill into new-paymentpluginapi