removing conflicts found when combinging reco,dqm,validation,pat

substitute duplicated code for  import statements 
ah - I missed that the EDFilter type was different between the two things with the same name.  So we just need to change the name of one of the modules.. argh.