Consumes are restored in DiLepton code, conflict is resolved

Checked on 
CMSSW_7_2_X_2014-07-01-0200
And everything looks ok.
Would you change the new commit, see if it addresses your comment?