Reset conditions if sameEntity is true

[cboehme]

Issue #177 described a problem that conditions were not reset with the reset of the elements in collectors. This was fixed in commit a20767d. However, it turned out that the problem still exists if a collector is reset because the entity changed.