killbill-aplcache

Merge remote-tracking branch 'origin/master' into usage Conflicts: beatrix/src/test/resources/beatrix.properties entitlement/src/test/resources/entitlement.properties junction/src/test/resources/junction.properties server/src/test/resources/killbill.properties subscription/src/test/resources/subscription.properties

First pass at simplifiying the various testCatalog. All tests …

take the same file with the same name

Refine catalog usage model

Removed unused test catalog

Implement usage catalog to match initial experimental catalog

Fix usage xml definition -- ongoing tweaking

Fix usage xml definition -- ongoing tweaking

Fix usage xml definition -- introducing blocks

Introduction of catalog recurring BillingMode

Usage catalog (ongoing proposal changes)