Update to Alpha4-SNAPSHOT.  Also make fixes based on JBCTS-1295 and JBCTS-1296