Merge "drools-pdp sonar issue fixes"