merge from droolsjbpm-tools/drools-eclipse 6.0.0.CR1