killbill-memoizeit

jaxrs, catalog: Fixes #531

jaxrs: Fix equals method for PhasePriceOverrideJson

jaxrs: Fixes issue #530 Populate the priceOverrides fields …

from the Subscription model to access overridden price catalog info.

Add migration files for HA feature

Merge branch 'hierarchical-accounts' of github.com:killbill/killbill …

into hierarchical-accounts

Conflicts:
	invoice/src/test/java/org/killbill/billing/invoice/api/user/TestDefaultInvoiceUserApi.java
	invoice/src/test/java/org/killbill/billing/invoice/dao/MockInvoiceDao.java

Merge branch 'work-for-release-0.17.0' into hierarchical-accounts

Merge branch 'work-for-release-0.17.0' into hierarchical-accounts

Fix merge issue (compilation error)

Merge issue (forgot flywaydb dep)

Merge branch 'work-for-release-0.17.0' into hierarchical-accounts Conflicts: account/pom.xml api/pom.xml beatrix/pom.xml catalog/pom.xml currency/pom.xml entitlement/pom.xml invoice/pom.xml invoice/src/main/java/org/killbill/billing/invoice/InvoiceListener.java invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceDao.java invoice/src/test/java/org/killbill/billing/invoice/api/user/TestDefaultInvoiceUserApi.java invoice/src/test/java/org/killbill/billing/invoice/dao/MockInvoiceDao.java jaxrs/pom.xml junction/pom.xml overdue/pom.xml payment/pom.xml payment/src/main/java/org/killbill/billing/payment/invoice/InvoicePaymentControlPluginApi.java pom.xml profiles/killbill/pom.xml profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java profiles/killpay/pom.xml profiles/pom.xml subscription/pom.xml tenant/pom.xml usage/pom.xml util/pom.xml