Dqm physics fix on top of 1312

fixed conflict for DQMPhysics_cff.py and cleanup