killbill-memoizeit

diff --git a/NEWS b/NEWS
index 25fa17e..02adac7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.11.11
+    Usage api change
+    Update commons for bug fixes
+
 0.11.10
     Payment bug fixes
     New Janitor tasks

diff --git a/profiles/killbill/src/main/resources/killbill-server.properties b/profiles/killbill/src/main/resources/killbill-server.properties
index 70ca588..36e7abf 100644
--- a/profiles/killbill/src/main/resources/killbill-server.properties
+++ b/profiles/killbill/src/main/resources/killbill-server.properties
@@ -16,35 +16,56 @@
 # under the License.
 #
 
-
+#
+# KILLBILL GENERIC PROPERTIES
+#
+# Database config
 org.killbill.dao.url=jdbc:mysql://127.0.0.1:3306/killbill
 org.killbill.dao.user=root
 org.killbill.dao.password=root
 org.killbill.dao.logLevel=DEBUG
-org.killbill.billing.osgi.dao.url=jdbc:mysql://127.0.0.1:3306/killbill
-org.killbill.billing.osgi.dao.user=root
-org.killbill.billing.osgi.dao.password=root
 
 # Use the SpyCarAdvanced.xml catalog
 org.killbill.catalog.uri=SpyCarAdvanced.xml
 
-# To enable test endpoint and have Kill Bill run with a ClockMock
-org.killbill.server.test.mode=true
+# NotificationQ, Bus, ExtBus config
+org.killbill.notificationq.main.sleep=1000
+org.killbill.notificationq.main.claimed=10
+org.killbill.persistent.bus.external.sticky=true
+org.killbill.persistent.bus.external.inMemory=true
+org.killbill.persistent.bus.main.sticky=true
+org.killbill.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.main.inflight.claimed=1
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.sleep=0
+org.killbill.persistent.bus.main.useInflightQ=true
+org.killbill.persistent.bus.main.queue.capacity=100
 
+# Start KB in multi-tenant
+org.killbill.server.multitenant=true
 
-org.killbill.notificationq.main.sleep=100
+#
+# PLUGIN SPECIFIC PROPERTIES
+#
+# Database config (OSGI plugins)
+org.killbill.billing.osgi.dao.url=jdbc:mysql://127.0.0.1:3306/killbill
+org.killbill.billing.osgi.dao.user=root
+org.killbill.billing.osgi.dao.password=root
 
-org.killbill.persistent.bus.main.sleep=100
-org.killbill.persistent.bus.main.nbThreads=1
-org.killbill.persistent.bus.main.claimed=1
-org.killbill.persistent.bus.main.sitcky=true
-org.killbill.persistent.bus.main.useInflightQ=true
+# Allow jruby concurrency
+org.killbill.jruby.context.scope=THREADSAFE
 
-org.killbill.persistent.bus.external.sleep=100
-org.killbill.persistent.bus.external.nbThreads=1
-org.killbill.persistent.bus.external.claimed=1
+# Path for plugin config
+#org.killbill.billing.osgi.bundles.jruby.conf.dir=your_path
+# Config property files for plugin to access
+#org.killbill.server.properties=file:///this_file
 
-org.killbill.server.multitenant=false
+#
+# INTEGRATION TESTS ONLY
+#
+# To enable test endpoint and have Kill Bill run with a ClockMock (should not be used for production server)
+org.killbill.server.test.mode=true
 
-com.sun.management.jmxremote.port=8989
+# Set payment calls to timeout after 5 sec -- mostly for integration tests
+org.killbill.payment.plugin.timeout=5s