Merge "Fix fortify issues identified in drools"