Revert "Merge branch 'nuvallsc_HLT1CaloClustering' into 'master'"

This reverts merge request !864 (merged)

This MR needs to be reverted as it breaks the nightlies. It should not have been merged in the first place as the tests were clearly red