Merge pull request #188 from sotty/5.5.x

DROOLS-91 + DROOLS-99 **Tentative** fix
[DROOLS-105]  Indexing may be broken with unification queries