Merge pull request #1270 from ldorau/Postpone_freeing_a_tracker_entry_until_it_is_really_removed_from_tracker

Postpone freeing a tracker entry, add a reference counter

Author: lplewa