add calibrated energy to CaloCluster

This is to reduce the number of additional intermediate collections needed for the particle flow ECAL clusters and super clusters.
It doesn't interfere with any of the current cluster producers.
Based on CMSSW_7_0_0_pre3.