Bug fix to avoid duplicated clusters on the same track in upgraded FPIX

This pull request includes a bug fix and a few changes in an analysis package
is this a long standing bug? should be propagated to 7_2_X and 7_3_X?
do we know the impact on Run1?