killbill-memoizeit

diff --git a/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz b/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz
index 1c6870c..8c3a706 100644
Binary files a/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz and b/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz differ

diff --git a/osgi-bundles/bundles/jruby/pom.xml b/osgi-bundles/bundles/jruby/pom.xml
index 7bcba79..42b79ff 100644
--- a/osgi-bundles/bundles/jruby/pom.xml
+++ b/osgi-bundles/bundles/jruby/pom.xml
@@ -156,6 +156,7 @@
                             com.ning.billing.util.callcontext;
                             com.ning.billing.util.customfield;
                             com.ning.billing.notification.plugin;
+                            com.ning.billing.currency.api;
                             com.ning.billing.util.email;
                             com.ning.billing.util.entity;
                             com.ning.billing.util.tag;

diff --git a/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java b/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
index 033e369..8a61b82 100644
--- a/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
+++ b/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
@@ -21,7 +21,6 @@ import org.osgi.util.tracker.ServiceTracker;
 
 import com.ning.billing.account.api.AccountUserApi;
 import com.ning.billing.catalog.api.CatalogUserApi;
-import com.ning.billing.currency.api.CurrencyConversion;
 import com.ning.billing.currency.api.CurrencyConversionApi;
 import com.ning.billing.entitlement.api.EntitlementApi;
 import com.ning.billing.entitlement.api.SubscriptionApi;

diff --git a/server/src/main/resources/killbill-server.properties b/server/src/main/resources/killbill-server.properties
index 0ea8ab7..063df9c 100644
--- a/server/src/main/resources/killbill-server.properties
+++ b/server/src/main/resources/killbill-server.properties
@@ -45,3 +45,6 @@ killbill.billing.persistent.bus.external.nbThreads=1
 killbill.billing.persistent.bus.external.claimed=1
 killbill.billing.persistent.bus.external.tableName=bus_ext_events
 killbill.billing.persistent.bus.external.historyTableName=bus_ext_events_history
+
+killbill.server.multitenant=false
+

diff --git a/util/src/main/java/com/ning/billing/util/config/OSGIConfig.java b/util/src/main/java/com/ning/billing/util/config/OSGIConfig.java
index ae17e54..7bf64d1 100644
--- a/util/src/main/java/com/ning/billing/util/config/OSGIConfig.java
+++ b/util/src/main/java/com/ning/billing/util/config/OSGIConfig.java
@@ -66,6 +66,7 @@ public interface OSGIConfig extends KillbillConfig {
              "com.ning.billing.util.customfield," +
              "com.ning.billing.notification.plugin," +
              "com.ning.billing.currency.plugin.api," +
+             "com.ning.billing.currency.api," +
              "com.ning.billing.util.email," +
              "com.ning.billing.util.entity," +
              "com.ning.billing.util.tag," +