First hamfisted attempt at merging java-plus into main java bundle