[jbpm-dev] Branch cleanup