In a non multi tenant environment, kb_tenant_id will come as a NULL value, so query should not check for that field in those cases.
Merge branch 'master' of github.com:killbill/killbill-plugin-framework-ruby