Merge "Fix drools-apps master csit"