killbill-uncached

diff --git a/beatrix/src/test/resources/killbill-payment-test.tar.gz b/beatrix/src/test/resources/killbill-payment-test.tar.gz
index 95dca6a..91c8088 100644
Binary files a/beatrix/src/test/resources/killbill-payment-test.tar.gz and b/beatrix/src/test/resources/killbill-payment-test.tar.gz differ

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlementApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlementApi.java
index 95d2005..e05385b 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlementApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/DefaultEntitlementApi.java
@@ -17,8 +17,6 @@
 package com.ning.billing.entitlement.api;
 
 import com.ning.billing.entitlement.dao.BlockingStateDao;
-import com.ning.billing.entitlement.api.BlockingState;
-import com.ning.billing.entitlement.api.EntitlementApi;
 import com.ning.billing.util.callcontext.InternalCallContextFactory;
 import com.ning.billing.util.callcontext.TenantContext;
 

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/dao/DefaultBlockingStateDao.java b/entitlement/src/main/java/com/ning/billing/entitlement/dao/DefaultBlockingStateDao.java
index ddd124a..6bc741a 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/dao/DefaultBlockingStateDao.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/dao/DefaultBlockingStateDao.java
@@ -51,7 +51,7 @@ public class DefaultBlockingStateDao implements BlockingStateDao {
 
     @Override
     public BlockingState getBlockingStateFor(final UUID blockableId, final InternalTenantContext context) {
-        return transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<BlockingState>() {
+        return transactionalSqlDao.execute(  new EntitySqlDaoTransactionWrapper<BlockingState>() {
             @Override
             public BlockingState inTransaction(final EntitySqlDaoWrapperFactory<EntitySqlDao> entitySqlDaoWrapperFactory) throws Exception {
                 final BlockingStateModelDao model = entitySqlDaoWrapperFactory.become(BlockingStateSqlDao.class).getBlockingStateFor(blockableId, context);

diff --git a/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BlockingCalculator.java b/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BlockingCalculator.java
index 7ed8092..7640d1b 100644
--- a/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BlockingCalculator.java
+++ b/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BlockingCalculator.java
@@ -143,15 +143,9 @@ public class BlockingCalculator {
                 if (duration.getEnd() != null) { // no second event in the pair means they are still disabled (no re-enable)
                     result.add(createNewReenableEvent(duration.getEnd(), precedingFinalEvent));
                 }
-
             } else if (precedingFinalEvent != null) { // can happen - e.g. phase event
-                //
-                // TODO: check with Jeff that this is going to do something sensible
-                //
                 result.add(createNewReenableEvent(duration.getEnd(), precedingFinalEvent));
-
             }
-
             // N.B. if there's no precedingInitial and no precedingFinal then there's nothing to do
         }
         return result;

diff --git a/osgi-bundles/bundles/jruby/pom.xml b/osgi-bundles/bundles/jruby/pom.xml
index 5880a43..c6de8b0 100644
--- a/osgi-bundles/bundles/jruby/pom.xml
+++ b/osgi-bundles/bundles/jruby/pom.xml
@@ -131,10 +131,11 @@
                             com.ning.billing.beatrix.bus.api;
                             com.ning.billing.catalog.api;
                             com.ning.billing.subscription.api;
-                            com.ning.billingsubscriptiont.api.migration;
-                            com.ning.billingsubscriptiont.api.timeline;
-                            com.ning.billingsubscriptiont.api.transfer;
-                            com.ning.billinsubscriptionnt.api.user;
+                            com.ning.billing.subscription.api.migration;
+                            com.ning.billing.subscription.api.timeline;
+                            com.ning.billing.subscription.api.transfer;
+                            com.ning.billing.subscription.api.user;
+                            com.ning.billing.entitlement.api;
                             com.ning.billing.invoice.api;
                             com.ning.billing.junction.api;
                             com.ning.billing;

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 6e7a878..b905d38 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
@@ -54,7 +54,7 @@ public interface OSGIConfig extends KillbillConfig {
              "com.ning.billing.subscription.api.transfer," +
              "com.ning.billing.subscription.api.user," +
              "com.ning.billing.invoice.api," +
-             "com.ning.billing.junction.api," +
+             "com.ning.billing.entitlement.api," +
              "com.ning.billing," +
              "com.ning.billing.notification.api," +
              "com.ning.billing.notification.plugin.api," +