Merge pull request #4845 from matteosan1/topic_bugfixGsfElectrons_SLHC16

bugfix for persistent gsfElectrons
Change the rest of the Shashlik ECal endcap collections to EcalRecHitsEK now that Sunanda fixed everything
Add EcalRecHitsEK to the mix objects, so that pileup is used as well