Usage of correct vertex collection for FPR; correct version of EgammaCoreTools (without bugfix for shower shape rechits within cluster)