Fix broken tests
Merge branch 'analytics-as-osgi-plugin' of github.com:killbill/killbill into analytics-as-osgi-plugin