Method2 for phase II

] Made fixes same as in PR #6647

] Merged Mark's PR that fixed a memory issue

] Hcal 25ns reconstruction Method2 is backported from 730 to the SLHC release
] First results were reported in https://indico.cern.ch/event/356574/contribution/7/material/slides/0.pdf