Merged HcalDQMMigrate4 from repository cowden