Merged heppy_working_example_from-CMSSW_7_0_9_patch2 from repository arizzi
fix wrong import