merge jbpm 6 samples