do not allow ROs that both have GSF tracks and clusters to merge.
fix the assignment of early/late brem.
fix local locking of ECAL clusters.