Revert "Merge branch 'adavis_bring_into_line_with_master' into 'FastCaloSim'"
This reverts merge request !629 (merged) that removed some features introduced since the FastCaloSim branch was made from master
This reverts merge request !629 (merged) that removed some features introduced since the FastCaloSim branch was made from master