backport of PR5772 to 72X
update of 72X PR
Merged refs/pull/5964/head from repository cms-sw
remove usage of HCAL electronic map
Allow experiment type to be set
Merge pull request #5964 from matteosan1/topic_HLTUpdateFor72X

Backport of "Update of some HLT filters for Egamma paths entering in 73X"
Merge pull request #6487 from wmtan/AllowExperimentTypeToBeSet7_2_X

Allow experiment type to be set in 7_2_X
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X