bug fix to compute ES cluster shapes
Merge pull request #6919 from matteosan1/topic_FixESClusterShapes74X

bug fix to compute ES cluster shapes
Merge remote branch 'origin/CMSSW_7_4_X' into CMSSW_7_0_X