killbill-aplcache

Fix HA merge integration issues

Merge remote-tracking branch 'origin/work-for-release-0.17.x' …

into hierarchical-accounts

server: fix test setup with cache invalidation Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

Merge branch 'ha-credit-553' of https://github.com/matias-aguero-hs/killbill …

into hierarchical-accounts

Conflicts:
	beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationInvoice.java
	jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxrsResource.java
	util/src/test/java/org/killbill/billing/GuicyKillbillTestWithEmbeddedDBModule.java

#561

#553 #561 : Some fixes over PR comments.

#553 : adding killbill client tests for transferChildCreditToParent

#553 : new api which allow to move a given child credit to the parent …

level

#553 #561 roll back on item_adj when parent invoice is in committed …

state.

#561 some test fixes.