Merge pull request #13 from gpetruc/miniAOD-from710pre5

thread-safety fixes from @gpetruc
fix p4
thread-safe relinking of pat photon cluster, as it was done for electrons