Align code to drools 5.6.0-SNAPSHOT

reflecting some changes in drools 5.6.x which may not have been backported