applies patch for BZ887847 and fixes problems with drools test scenario